BASELINE: Update Chromium to 78.0.3904.130

Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 25 insertions, 23 deletions

diff --git a/chromium/content/browser/loader/navigation_url_loader_impl_unittest.cc b/chromium/content/browser/loader/navigation_url_loader_impl_unittest.cc
index 59828257034..1e2f87380e1 100644
--- a/chromium/content/browser/loader/navigation_url_loader_impl_unittest.cc
+++ b/chromium/content/browser/loader/navigation_url_loader_impl_unittest.cc
@@ -29,8 +29,8 @@
 #include "content/public/browser/system_connector.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/test/browser_task_environment.h"
 #include "content/public/test/test_browser_context.h"
-#include "content/public/test/test_browser_thread_bundle.h"
 #include "content/test/test_navigation_url_loader_delegate.h"
 #include "net/base/load_flags.h"
 #include "net/base/mock_network_change_notifier.h"
@@ -74,7 +74,6 @@ class TestNavigationLoaderInterceptor : public NavigationLoaderInterceptor {
 
   void MaybeCreateLoader(const network::ResourceRequest& resource_request,
                          BrowserContext* browser_context,
-                         ResourceContext* resource_context,
                          LoaderCallback callback,
                          FallbackCallback fallback_callback) override {
     std::move(callback).Run(base::BindOnce(
@@ -97,7 +96,8 @@ class TestNavigationLoaderInterceptor : public NavigationLoaderInterceptor {
         std::move(client), TRAFFIC_ANNOTATION_FOR_TESTS, &params,
         0, /* request_id */
         resource_scheduler_client_, nullptr /* keepalive_statistics_recorder */,
-        nullptr /* network_usage_accumulator */, nullptr /* header_client */);
+        nullptr /* network_usage_accumulator */, nullptr /* header_client */,
+        nullptr /* origin_policy_manager */);
   }
 
   bool MaybeCreateLoaderForResponse(
@@ -130,11 +130,9 @@ class TestNavigationLoaderInterceptor : public NavigationLoaderInterceptor {
 class NavigationURLLoaderImplTest : public testing::Test {
  public:
   NavigationURLLoaderImplTest()
-      : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP),
-        network_change_notifier_(
-            net::test::MockNetworkChangeNotifier::Create()) {
-    feature_list_.InitAndEnableFeature(network::features::kNetworkService);
-
+      : network_change_notifier_(
+            net::test::MockNetworkChangeNotifier::Create()),
+        task_environment_(BrowserTaskEnvironment::IO_MAINLOOP) {
     // Because the network service is enabled we need a system Connector or
     // BrowserContext::GetDefaultStoragePartition will segfault when
     // ContentBrowserClient::CreateNetworkContext tries to call
@@ -177,16 +175,16 @@ class NavigationURLLoaderImplTest : public testing::Test {
             GURL() /* client_side_redirect_url */,
             base::nullopt /* devtools_initiator_info */);
 
-    CommonNavigationParams common_params;
-    common_params.url = url;
-    common_params.initiator_origin = url::Origin::Create(url);
-    common_params.method = method;
-    common_params.download_policy = download_policy;
+    auto common_params = CreateCommonNavigationParams();
+    common_params->url = url;
+    common_params->initiator_origin = url::Origin::Create(url);
+    common_params->method = method;
+    common_params->download_policy = download_policy;
     url::Origin origin = url::Origin::Create(url);
 
     std::unique_ptr<NavigationRequestInfo> request_info(
         new NavigationRequestInfo(
-            common_params, std::move(begin_params), url,
+            std::move(common_params), std::move(begin_params), url,
             net::NetworkIsolationKey(origin, origin), is_main_frame,
             false /* parent_is_main_frame */, false /* are_ancestors_secure */,
             -1 /* frame_tree_node_id */, false /* is_for_guests_only */,
@@ -194,14 +192,15 @@ class NavigationURLLoaderImplTest : public testing::Test {
             upgrade_if_insecure /* upgrade_if_insecure */,
             nullptr /* blob_url_loader_factory */,
             base::UnguessableToken::Create() /* devtools_navigation_token */,
-            base::UnguessableToken::Create() /* devtools_frame_token */));
+            base::UnguessableToken::Create() /* devtools_frame_token */,
+            false /* obey_origin_policy */));
     std::vector<std::unique_ptr<NavigationLoaderInterceptor>> interceptors;
     most_recent_resource_request_ = base::nullopt;
     interceptors.push_back(std::make_unique<TestNavigationLoaderInterceptor>(
         &most_recent_resource_request_));
 
     return std::make_unique<NavigationURLLoaderImpl>(
-        browser_context_.get(), browser_context_->GetResourceContext(),
+        browser_context_.get(),
         BrowserContext::GetDefaultStoragePartition(browser_context_.get()),
         std::move(request_info), nullptr /* navigation_ui_data */,
         nullptr /* service_worker_handle */, nullptr /* appcache_handle */,
@@ -296,11 +295,10 @@ class NavigationURLLoaderImplTest : public testing::Test {
   }
 
  protected:
-  base::test::ScopedFeatureList feature_list_;
-  TestBrowserThreadBundle thread_bundle_;
-  std::unique_ptr<TestBrowserContext> browser_context_;
   std::unique_ptr<net::test::MockNetworkChangeNotifier>
       network_change_notifier_;
+  BrowserTaskEnvironment task_environment_;
+  std::unique_ptr<TestBrowserContext> browser_context_;
   net::EmbeddedTestServer http_test_server_;
   base::Optional<network::ResourceRequest> most_recent_resource_request_;
 };
@@ -331,8 +329,10 @@ TEST_F(NavigationURLLoaderImplTest, NetworkIsolationKeyOfMainFrameNavigation) {
   delegate.WaitForRequestStarted();
 
   ASSERT_TRUE(most_recent_resource_request_);
-  EXPECT_EQ(net::NetworkIsolationKey(origin, origin),
-            most_recent_resource_request_->trusted_network_isolation_key);
+  ASSERT_TRUE(most_recent_resource_request_->trusted_params);
+  EXPECT_EQ(
+      net::NetworkIsolationKey(origin, origin),
+      most_recent_resource_request_->trusted_params->network_isolation_key);
 }
 
 TEST_F(NavigationURLLoaderImplTest,
@@ -345,8 +345,10 @@ TEST_F(NavigationURLLoaderImplTest,
 
   HTTPRedirectOriginHeaderTest(url, "GET", "GET", url.GetOrigin().spec());
 
-  EXPECT_EQ(net::NetworkIsolationKey(origin, origin),
-            most_recent_resource_request_->trusted_network_isolation_key);
+  ASSERT_TRUE(most_recent_resource_request_->trusted_params);
+  EXPECT_EQ(
+      net::NetworkIsolationKey(origin, origin),
+      most_recent_resource_request_->trusted_params->network_isolation_key);
 }
 
 TEST_F(NavigationURLLoaderImplTest, Redirect301Tests) {