Origin Policy: Use existing URLLoaderFactory.

This follows post-commit feedback on
https://chromium-review.googlesource.com/1088918

Bug: 751996
Change-Id: I230c4ff13122d7977ee6f2901cd08a25f67466a5
Reviewed-on: https://chromium-review.googlesource.com/1148395Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Daniel Vogelheim <vogelheim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578810}

content/browser/frame_host/origin_policy_throttle.cc

@@ -8,14 +8,14 @@
 #include "base/feature_list.h"
 #include "base/no_destructor.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
-#include "content/public/browser/network_service_instance.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
+#include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
-#include "services/network/network_context.h"
-#include "services/network/network_service.h"
 #include "services/network/public/cpp/simple_url_loader.h"
 #include "url/origin.h"
 
@@ -164,24 +164,6 @@ const url::Origin OriginPolicyThrottle::GetRequestOrigin() {
 }
 
 void OriginPolicyThrottle::FetchPolicy(const GURL& url, FetchCallback done) {
-  // Obtain a network context from the network service.
-  network::mojom::NetworkContextParamsPtr context_params =
-      network::mojom::NetworkContextParams::New();
-  content::GetNetworkService()->CreateNetworkContext(
-      mojo::MakeRequest(&network_context_ptr_), std::move(context_params));
-
-  // Create URLLoaderFactory
-  network::mojom::URLLoaderFactoryParamsPtr url_loader_factory_params =
-      network::mojom::URLLoaderFactoryParams::New();
-  url_loader_factory_params->process_id = network::mojom::kBrowserProcessId;
-  url_loader_factory_params->is_corb_enabled = false;
-  url_loader_factory_params->disable_web_security =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableWebSecurity);
-  network_context_ptr_->CreateURLLoaderFactory(
-      mojo::MakeRequest(&url_loader_factory_),
-      std::move(url_loader_factory_params));
-
   // Create the traffic annotation
   net::NetworkTrafficAnnotationTag traffic_annotation =
       net::DefineNetworkTrafficAnnotation("origin_policy_loader", R"(
@@ -209,14 +191,27 @@ void OriginPolicyThrottle::FetchPolicy(const GURL& url, FetchCallback done) {
   std::unique_ptr<network::ResourceRequest> policy_request =
       std::make_unique<network::ResourceRequest>();
   policy_request->url = url;
+  policy_request->request_initiator = url::Origin::Create(url);
+  policy_request->fetch_credentials_mode =
+      network::mojom::FetchCredentialsMode::kOmit;
   policy_request->fetch_redirect_mode =
       network::mojom::FetchRedirectMode::kError;
+  policy_request->load_flags = net::LOAD_DO_NOT_SEND_COOKIES |
+                               net::LOAD_DO_NOT_SAVE_COOKIES |
+                               net::LOAD_DO_NOT_SEND_AUTH_DATA;
   url_loader_ = network::SimpleURLLoader::Create(std::move(policy_request),
                                                  traffic_annotation);
-  url_loader_->SetAllowHttpErrorResults(false);
+
+  // Obtain the URLLoaderFactory from the NavigationHandle.
+  SiteInstance* site_instance = navigation_handle()->GetStartingSiteInstance();
+  content::StoragePartition* storage_partition =
+      BrowserContext::GetStoragePartition(site_instance->GetBrowserContext(),
+                                          site_instance);
+  scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory =
+      storage_partition->GetURLLoaderFactoryForBrowserProcess();
 
   // Start the download, and pass the callback for when we're finished.
-  url_loader_->DownloadToString(url_loader_factory_.get(), std::move(done),
+  url_loader_->DownloadToString(url_loader_factory.get(), std::move(done),
                                 kMaxPolicySize);
 }
 
@@ -229,8 +224,6 @@ void OriginPolicyThrottle::OnTheGloriousPolicyHasArrived(
     std::unique_ptr<std::string> policy_content) {
   // Release resources associated with the loading.
   url_loader_.reset();
-  url_loader_factory_.reset();
-  network_context_ptr_.reset();
 
   // Fail hard if the policy could not be loaded.
   if (!policy_content) {

content/browser/frame_host/origin_policy_throttle.h

@@ -6,11 +6,13 @@
 #define CONTENT_BROWSER_FRAME_HOST_ORIGIN_POLICY_THROTTLE_H_
 
 #include <map>
+#include <memory>
 #include <string>
+
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
+#include "base/memory/scoped_refptr.h"
 #include "content/public/browser/navigation_throttle.h"
-#include "services/network/public/mojom/network_service.mojom.h"
 
 class GURL;
 
@@ -71,11 +73,8 @@ class CONTENT_EXPORT OriginPolicyThrottle : public NavigationThrottle {
   void OnTheGloriousPolicyHasArrived(
       std::unique_ptr<std::string> policy_content);
 
-  // We may need the SimpleURLLoader to download the policy.
-  // The network context and url loader must be kept alive while the load is
-  // ongoing.
-  network::mojom::NetworkContextPtr network_context_ptr_;
-  network::mojom::URLLoaderFactoryPtr url_loader_factory_;
+  // We may need the SimpleURLLoader to download the policy. The loader must
+  // be kept alive while the load is ongoing.
   std::unique_ptr<network::SimpleURLLoader> url_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(OriginPolicyThrottle);