Adapt NetworkContextConfigurationBrowserTest to work with split cache

Adds a NetworkIsolationKey to the requests so that they are still
cached when the split cache config is enabled. We set the is_trusted
param for a URLLoaderFactory in a safe browsing or system network
context as it was previously left unset.

Bug: 1003883
Change-Id: I6e93980c6034b11e11b6ab2a0620b377c6c8caa0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1803873Reviewed-by: Shivani Sharma <shivanisha@chromium.org>
Reviewed-by: Nathan Parker <nparker@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Alex Turner <alexmt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697226}

chrome/browser/net/network_context_configuration_browsertest.cc

@@ -873,9 +873,15 @@ IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest, Cache) {
 
   // Make a request whose response should be cached.
   GURL request_url = embedded_test_server()->GetURL("/cachetime");
+  url::Origin request_origin =
+      url::Origin::Create(embedded_test_server()->base_url());
   std::unique_ptr<network::ResourceRequest> request =
       std::make_unique<network::ResourceRequest>();
   request->url = request_url;
+  request->trusted_params = network::ResourceRequest::TrustedParams();
+  request->trusted_params->network_isolation_key =
+      net::NetworkIsolationKey(request_origin, request_origin);
+
   content::SimpleURLLoaderTestHelper simple_loader_helper;
   std::unique_ptr<network::SimpleURLLoader> simple_loader =
       network::SimpleURLLoader::Create(std::move(request),
@@ -896,6 +902,10 @@ IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest, Cache) {
   std::unique_ptr<network::ResourceRequest> request2 =
       std::make_unique<network::ResourceRequest>();
   request2->url = request_url;
+  request2->trusted_params = network::ResourceRequest::TrustedParams();
+  request2->trusted_params->network_isolation_key =
+      net::NetworkIsolationKey(request_origin, request_origin);
+
   content::SimpleURLLoaderTestHelper simple_loader_helper2;
   std::unique_ptr<network::SimpleURLLoader> simple_loader2 =
       network::SimpleURLLoader::Create(std::move(request2),
@@ -972,6 +982,7 @@ IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest, PRE_DiskCache) {
   // cache in the next test). The profile directory is preserved between the
   // PRE_DiskCache and DiskCache run, so can just keep a file there.
   GURL test_url = embedded_test_server()->GetURL(kCacheRandomPath);
+  url::Origin test_origin = url::Origin::Create(test_url);
   base::ScopedAllowBlockingForTesting allow_blocking;
   base::FilePath save_url_file_path = browser()->profile()->GetPath().Append(
       FILE_PATH_LITERAL("url_for_test.txt"));
@@ -980,6 +991,9 @@ IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest, PRE_DiskCache) {
   std::unique_ptr<network::ResourceRequest> request =
       std::make_unique<network::ResourceRequest>();
   request->url = test_url;
+  request->trusted_params = network::ResourceRequest::TrustedParams();
+  request->trusted_params->network_isolation_key =
+      net::NetworkIsolationKey(test_origin, test_origin);
 
   content::SimpleURLLoaderTestHelper simple_loader_helper;
   std::unique_ptr<network::SimpleURLLoader> simple_loader =
@@ -1027,6 +1041,7 @@ IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest, DiskCache) {
 
   GURL test_url = GURL(file_data.substr(0, newline_pos));
   ASSERT_TRUE(test_url.is_valid()) << test_url.possibly_invalid_spec();
+  url::Origin test_origin = url::Origin::Create(test_url);
 
   std::string original_response = file_data.substr(newline_pos + 1);
 
@@ -1034,6 +1049,10 @@ IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest, DiskCache) {
   std::unique_ptr<network::ResourceRequest> request =
       std::make_unique<network::ResourceRequest>();
   request->url = test_url;
+  request->trusted_params = network::ResourceRequest::TrustedParams();
+  request->trusted_params->network_isolation_key =
+      net::NetworkIsolationKey(test_origin, test_origin);
+
   content::SimpleURLLoaderTestHelper simple_loader_helper;
   request->load_flags = net::LOAD_ONLY_FROM_CACHE;
   std::unique_ptr<network::SimpleURLLoader> simple_loader =

chrome/browser/net/system_network_context_manager.cc

@@ -332,6 +332,7 @@ SystemNetworkContextManager::GetURLLoaderFactory() {
       network::mojom::URLLoaderFactoryParams::New();
   params->process_id = network::mojom::kBrowserProcessId;
   params->is_corb_enabled = false;
+  params->is_trusted = true;
   GetContext()->CreateURLLoaderFactory(mojo::MakeRequest(&url_loader_factory_),
                                        std::move(params));
   return url_loader_factory_.get();

components/safe_browsing/browser/safe_browsing_network_context.cc

@@ -97,6 +97,7 @@ class SafeBrowsingNetworkContext::SharedURLLoaderFactory
           network::mojom::URLLoaderFactoryParams::New();
       params->process_id = network::mojom::kBrowserProcessId;
       params->is_corb_enabled = false;
+      params->is_trusted = true;
       GetNetworkContext()->CreateURLLoaderFactory(
           MakeRequest(&url_loader_factory_), std::move(params));
     }