Merge branch 'main' into main

briantting · Apr 30, 2024 · 25580e1 · 25580e1
2 parents 235899e + 7fa46d0
commit 25580e1
Show file tree

Hide file tree

Showing 35 changed files with 302 additions and 286 deletions.
diff --git a/cobalt/build/cobalt_configuration.py b/cobalt/build/cobalt_configuration.py
@@ -137,8 +137,6 @@ def GetWebPlatformTestFilters(self):
         'websockets/WebPlatformTest.Run/websockets_opening_handshake_003_html',
         'websockets/WebPlatformTest.Run/websockets_opening_handshake_005_html',
         'service_workers/WebPlatformTest.Run/service_workers_service_worker_register_wait_forever_in_install_worker_https_html',
-        'csp/WebPlatformTest.Run/content_security_policy_script_src_script_src_1_10_1_html',
-        'html/WebPlatformTest.Run/html_dom_documents_dom_tree_accessors_Document_currentScript_sub_html',
     ]
     return filters
 

diff --git a/cobalt/loader/BUILD.gn b/cobalt/loader/BUILD.gn
@@ -175,9 +175,7 @@ target(gtest_target_type, "loader_test") {
 
   sources = [
     "blob_fetcher_test.cc",
-
-    # TODO: b/335330660 - Re-enable FetcherCacheTests once crash is fixed for evergreen.
-    # "fetcher_cache_test.cc",
+    "fetcher_cache_test.cc",
     "fetcher_factory_test.cc",
     "fetcher_test.h",
     "file_fetcher_test.cc",

diff --git a/cobalt/loader/fetcher_cache_test.cc b/cobalt/loader/fetcher_cache_test.cc
@@ -22,8 +22,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/test/task_environment.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "cobalt/loader/fetcher.h"
 #include "net/http/http_response_headers.h"
@@ -150,15 +150,15 @@ TEST_F(FetcherCacheTest, SunnyDay) {
   scoped_refptr<net::HttpResponseHeaders> headers =
       base::MakeRefCounted<net::HttpResponseHeaders>("HTTP/1.1 200 OK\n");
 
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireResponseStarted,
                      base::Unretained(stub_fetcher_factory.fetcher), headers));
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE, base::BindOnce(&StubFetcher::FireReceived,
                                 base::Unretained(stub_fetcher_factory.fetcher),
                                 data_.c_str(), data_.size()));
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireDone,
                      base::Unretained(stub_fetcher_factory.fetcher)));
@@ -187,7 +187,7 @@ TEST_F(FetcherCacheTest, DuplicateFetcherCache) {
     stub_fetcher_factorys.push_back(stub_fetcher_factory);
     fetcher_creators.push_back(fetcher_creator);
     fetchers.push_back(std::move(fetcher));
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
         FROM_HERE,
         base::BindOnce(&StubFetcher::FireFetcherProcess,
                        base::Unretained(stub_fetcher_factorys[i].fetcher),
@@ -219,7 +219,7 @@ TEST_F(FetcherCacheTest, MultipleFetcherCache) {
     stub_fetcher_factorys.push_back(stub_fetcher_factory);
     fetcher_creators.push_back(fetcher_creator);
     fetchers.push_back(std::move(fetcher));
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
         FROM_HERE,
         base::BindOnce(&StubFetcher::FireFetcherProcess,
                        base::Unretained(stub_fetcher_factorys[i].fetcher),
@@ -255,7 +255,7 @@ TEST_F(FetcherCacheTest, MaxFetcherCache) {
     stub_fetcher_factorys.push_back(stub_fetcher_factory);
     fetcher_creators.push_back(fetcher_creator);
     fetchers.push_back(std::move(fetcher));
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
         FROM_HERE,
         base::BindOnce(&StubFetcher::FireFetcherProcess,
                        base::Unretained(stub_fetcher_factorys[i].fetcher),
@@ -284,30 +284,30 @@ TEST_F(FetcherCacheTest, DisorderedSameFetcherCache) {
   std::unique_ptr<Fetcher> fetcher2 = fetcher_creator2.Run(&handler);
 
   // Task 1: start and receive
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireResponseStarted,
                      base::Unretained(stub_fetcher_factory1.fetcher), headers));
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE, base::BindOnce(&StubFetcher::FireReceived,
                                 base::Unretained(stub_fetcher_factory1.fetcher),
                                 data_.c_str(), data_.size()));
   // Task 2: start and receive
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireResponseStarted,
                      base::Unretained(stub_fetcher_factory2.fetcher), headers));
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE, base::BindOnce(&StubFetcher::FireReceived,
                                 base::Unretained(stub_fetcher_factory2.fetcher),
                                 data_.c_str(), data_.size()));
   // Task 1: done
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireDone,
                      base::Unretained(stub_fetcher_factory1.fetcher)));
   // Task 2: done
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireDone,
                      base::Unretained(stub_fetcher_factory2.fetcher)));
@@ -334,30 +334,30 @@ TEST_F(FetcherCacheTest, DisorderedDiffFetcherCache) {
   std::unique_ptr<Fetcher> fetcher2 = fetcher_creator2.Run(&handler);
 
   // Task 1: start and receive
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireResponseStarted,
                      base::Unretained(stub_fetcher_factory1.fetcher), headers));
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE, base::BindOnce(&StubFetcher::FireReceived,
                                 base::Unretained(stub_fetcher_factory1.fetcher),
                                 data_.c_str(), data_.size()));
   // Task 2: start and receive
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireResponseStarted,
                      base::Unretained(stub_fetcher_factory2.fetcher), headers));
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE, base::BindOnce(&StubFetcher::FireReceived,
                                 base::Unretained(stub_fetcher_factory2.fetcher),
                                 data_.c_str(), data_.size()));
   // Task 1: done
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireDone,
                      base::Unretained(stub_fetcher_factory1.fetcher)));
   // Task 2: done
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireDone,
                      base::Unretained(stub_fetcher_factory2.fetcher)));
@@ -384,29 +384,29 @@ TEST_F(FetcherCacheTest, DisorderedSlowFetcherCache) {
   std::unique_ptr<Fetcher> fetcher2 = fetcher_creator2.Run(&handler);
 
   // Task 1: start and receive
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireResponseStarted,
                      base::Unretained(stub_fetcher_factory1.fetcher), headers));
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE, base::BindOnce(&StubFetcher::FireReceived,
                                 base::Unretained(stub_fetcher_factory1.fetcher),
                                 data_.c_str(), data_.size()));
   // Task 2: start, receive, and done
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireResponseStarted,
                      base::Unretained(stub_fetcher_factory2.fetcher), headers));
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE, base::BindOnce(&StubFetcher::FireReceived,
                                 base::Unretained(stub_fetcher_factory2.fetcher),
                                 data_.c_str(), data_.size()));
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireDone,
                      base::Unretained(stub_fetcher_factory2.fetcher)));
   // Task 1: done
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&StubFetcher::FireDone,
                      base::Unretained(stub_fetcher_factory1.fetcher)));

diff --git a/components/update_client/BUILD.gn b/components/update_client/BUILD.gn
@@ -123,7 +123,6 @@ static_library("test_support") {
 
   if (cobalt_pending_clean_up) {
     sources -= [
-      "net/network_impl_cobalt.cc",
       "net/url_request_post_interceptor.cc",
     ]
   }

diff --git a/components/update_client/action_runner.cc b/components/update_client/action_runner.cc
@@ -59,14 +59,14 @@ namespace update_client {
 ActionRunner::ActionRunner(const Component& component)
     : is_per_user_install_(component.config()->IsPerUserInstall()),
       component_(component),
-      main_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
+      main_task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {}
 
 ActionRunner::~ActionRunner() {
-  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 }
 
 void ActionRunner::Run(Callback run_complete) {
-  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   run_complete_ = std::move(run_complete);
 

diff --git a/components/update_client/action_runner.h b/components/update_client/action_runner.h
@@ -15,7 +15,7 @@
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/threading/thread_checker.h"
+#include "base/sequence_checker.h"
 #include "build/build_config.h"
 #include "components/update_client/component_unpacker.h"
 
@@ -59,14 +59,14 @@ class ActionRunner {
   const Component& component_;
 
   // Used to post callbacks to the main thread.
-  scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
+  scoped_refptr<base::SequencedTaskRunner> main_task_runner_;
 
   // Contains the unpack path for the component associated with the run action.
   base::FilePath unpack_path_;
 
   Callback run_complete_;
 
-  THREAD_CHECKER(thread_checker_);
+  SEQUENCE_CHECKER(sequence_checker_);
   DISALLOW_COPY_AND_ASSIGN(ActionRunner);
 };