Add support in the network service for different contexts.

content/browser/loader/navigation_url_loader_network_service.cc

Index: content/browser/loader/navigation_url_loader_network_service.cc
diff --git a/content/browser/loader/navigation_url_loader_network_service.cc b/content/browser/loader/navigation_url_loader_network_service.cc
index be7fcf142da85e587b9c028dafeb1e7041470926..e8f55b3f3fd006832a8823966609869ccf16a025 100644
--- a/content/browser/loader/navigation_url_loader_network_service.cc
+++ b/content/browser/loader/navigation_url_loader_network_service.cc
@@ -15,8 +15,10 @@
 #include "content/browser/loader/navigation_resource_handler.h"
 #include "content/browser/loader/navigation_resource_throttle.h"
 #include "content/browser/loader/navigation_url_loader_delegate.h"
+#include "content/browser/storage_partition_impl.h"
 #include "content/browser/webui/url_data_manager_backend.h"
 #include "content/browser/webui/web_ui_url_loader_factory.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/navigation_data.h"
@@ -24,12 +26,9 @@
 #include "content/public/browser/ssl_status.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/common/referrer.h"
-#include "content/public/common/service_manager_connection.h"
-#include "content/public/common/service_names.mojom.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context.h"
-#include "services/service_manager/public/cpp/connector.h"
 
 namespace content {
 
@@ -67,6 +66,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
     NavigationURLLoaderDelegate* delegate)
     : delegate_(delegate),
       binding_(this),
+      storage_partition_(static_cast<StoragePartitionImpl*>(storage_partition)),
       request_info_(std::move(request_info)),
       weak_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -238,8 +238,8 @@ NavigationURLLoaderNetworkService::GetURLLoaderFactory() {
   // TODO(yzshen): We will need the ability to customize the factory per frame
   // e.g., for appcache or service worker.
   if (!g_url_loader_factory.Get()) {
-    ServiceManagerConnection::GetForProcess()->GetConnector()->BindInterface(
-        mojom::kNetworkServiceName, &g_url_loader_factory.Get());
+    storage_partition_->network_context()->CreateURLLoaderFactory(
+        MakeRequest(&g_url_loader_factory.Get()), 0);
   }
 
   return g_url_loader_factory.Get().get();