Add support in the network service for different contexts.

content/browser/storage_partition_impl.h

Index: content/browser/storage_partition_impl.h
diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h
index 5b706ff98b5425e0994359f5b54272ce0898694c..0e70993d3805f3f4a68612d2f8abe4d8bd600e5b 100644
--- a/content/browser/storage_partition_impl.h
+++ b/content/browser/storage_partition_impl.h
@@ -28,7 +28,9 @@
 #include "content/browser/payments/payment_app_context_impl.h"
 #include "content/browser/push_messaging/push_messaging_context.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
+#include "content/browser/url_loader_factory_getter.h"
 #include "content/common/content_export.h"
+#include "content/common/network_service.mojom.h"
 #include "content/common/storage_partition_service.mojom.h"
 #include "content/public/browser/storage_partition.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
@@ -77,19 +79,6 @@ class CONTENT_EXPORT  StoragePartitionImpl
   HostZoomLevelContext* GetHostZoomLevelContext() override;
   ZoomLevelDelegate* GetZoomLevelDelegate() override;
   PlatformNotificationContextImpl* GetPlatformNotificationContext() override;
-  void ClearBluetoothAllowedDevicesMapForTesting() override;
-
-  BackgroundFetchContext* GetBackgroundFetchContext();
-  BackgroundSyncContext* GetBackgroundSyncContext();
-  PaymentAppContextImpl* GetPaymentAppContext();
-  BroadcastChannelProvider* GetBroadcastChannelProvider();
-  BluetoothAllowedDevicesMap* GetBluetoothAllowedDevicesMap();
-
-  // mojom::StoragePartitionService interface.
-  void OpenLocalStorage(
-      const url::Origin& origin,
-      mojo::InterfaceRequest<mojom::LevelDBWrapper> request) override;
-
   void ClearDataForOrigin(uint32_t remove_mask,
                           uint32_t quota_storage_remove_mask,
                           const GURL& storage_origin,
@@ -102,7 +91,6 @@ class CONTENT_EXPORT  StoragePartitionImpl
                  const base::Time begin,
                  const base::Time end,
                  const base::Closure& callback) override;
-
   void ClearData(uint32_t remove_mask,
                  uint32_t quota_storage_remove_mask,
                  const OriginMatcherFunction& origin_matcher,
@@ -110,14 +98,32 @@ class CONTENT_EXPORT  StoragePartitionImpl
                  const base::Time begin,
                  const base::Time end,
                  const base::Closure& callback) override;
-
   void ClearHttpAndMediaCaches(
       const base::Time begin,
       const base::Time end,
       const base::Callback<bool(const GURL&)>& url_matcher,
       const base::Closure& callback) override;
-
   void Flush() override;
+  void ClearBluetoothAllowedDevicesMapForTesting() override;
+
+  BackgroundFetchContext* GetBackgroundFetchContext();
+  BackgroundSyncContext* GetBackgroundSyncContext();
+  PaymentAppContextImpl* GetPaymentAppContext();
+  BroadcastChannelProvider* GetBroadcastChannelProvider();
+  BluetoothAllowedDevicesMap* GetBluetoothAllowedDevicesMap();
+
+  // mojom::StoragePartitionService interface.
+  void OpenLocalStorage(
+      const url::Origin& origin,
+      mojo::InterfaceRequest<mojom::LevelDBWrapper> request) override;
+
+  // Returns the NetworkContext associated with this storage partition. Only
+  // used when the network service is enabled.
+  mojom::NetworkContext* network_context() { return network_context_.get(); }
+
+  scoped_refptr<URLLoaderFactoryGetter> url_loader_factory_getter() {
+    return url_loader_factory_getter_;
+  }
 
   // Can return nullptr while |this| is being destroyed.
   BrowserContext* browser_context() const;
@@ -216,6 +222,7 @@ class CONTENT_EXPORT  StoragePartitionImpl
   base::FilePath partition_path_;
   scoped_refptr<net::URLRequestContextGetter> url_request_context_;
   scoped_refptr<net::URLRequestContextGetter> media_url_request_context_;
+  scoped_refptr<URLLoaderFactoryGetter> url_loader_factory_getter_;
   scoped_refptr<storage::QuotaManager> quota_manager_;
   scoped_refptr<ChromeAppCacheService> appcache_service_;
   scoped_refptr<storage::FileSystemContext> filesystem_context_;
@@ -235,6 +242,7 @@ class CONTENT_EXPORT  StoragePartitionImpl
   scoped_refptr<BluetoothAllowedDevicesMap> bluetooth_allowed_devices_map_;
 
   mojo::BindingSet<mojom::StoragePartitionService> bindings_;
+  mojom::NetworkContextPtr network_context_;
 
   // Raw pointer that should always be valid. The BrowserContext owns the
   // StoragePartitionImplMap which then owns StoragePartitionImpl. When the