Hook up ProfileIOData's URLRequestContext to a NetworkService.

content/browser/storage_partition_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/storage_partition_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 12 matching lines @@
 #include "content/browser/fileapi/browser_file_system_helper.h"
 #include "content/browser/gpu/shader_cache_factory.h"
 #include "content/browser/notifications/platform_notification_context_impl.h"
 #include "content/common/dom_storage/dom_storage_types.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/indexed_db_context.h"
 #include "content/public/browser/local_storage_usage_info.h"
-#include "content/public/browser/network_service_instance.h"
 #include "content/public/browser/session_storage_usage_info.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
@@ skipping 463 matching lines @@
   partition->payment_app_context_->Init(partition->service_worker_context_);
 
   partition->broadcast_channel_provider_ = new BroadcastChannelProvider();
 
   partition->bluetooth_allowed_devices_map_ = new BluetoothAllowedDevicesMap();
 
   scoped_refptr<ChromeBlobStorageContext> blob_context =
       ChromeBlobStorageContext::GetFor(context);
 
   if (base::FeatureList::IsEnabled(features::kNetworkService)) {
-    mojom::NetworkContextParamsPtr context_params =
-        mojom::NetworkContextParams::New();
-    // TODO: fill this
-    // context_params->cache_dir =
-    // context_params->cookie_path =
-    GetNetworkService()->CreateNetworkContext(
-        MakeRequest(&partition->network_context_), std::move(context_params));
+    if (relative_partition_path.empty()) {
+      partition->network_context_ =
+          GetContentClient()->browser()->CreateMainNetworkContext(context);
+    } else {
+      partition->network_context_ =
+          GetContentClient()
+              ->browser()
+              ->CreateNetworkContextForStoragePartition(context, in_memory,
+                                                        partition_path);
+    }
 
     BlobURLLoaderFactory::BlobContextGetter blob_getter =
         base::BindOnce(&BlobStorageContextGetter, blob_context);
     partition->blob_url_loader_factory_ = BlobURLLoaderFactory::Create(
         std::move(blob_getter), partition->filesystem_context_);
 
     partition->url_loader_factory_getter_ = new URLLoaderFactoryGetter();
     partition->url_loader_factory_getter_->Initialize(partition.get());
   }
 
@@ skipping 15 matching lines @@
 
 net::URLRequestContextGetter* StoragePartitionImpl::GetURLRequestContext() {
   return url_request_context_.get();
 }
 
 net::URLRequestContextGetter*
 StoragePartitionImpl::GetMediaURLRequestContext() {
   return media_url_request_context_.get();
 }
 
+mojom::NetworkContext* StoragePartitionImpl::GetNetworkContext() {
+  DCHECK(base::FeatureList::IsEnabled(features::kNetworkService));
+  return network_context_.get();
+}
+
 storage::QuotaManager* StoragePartitionImpl::GetQuotaManager() {
   return quota_manager_.get();
 }
 
 ChromeAppCacheService* StoragePartitionImpl::GetAppCacheService() {
   return appcache_service_.get();
 }
 
 storage::FileSystemContext* StoragePartitionImpl::GetFileSystemContext() {
   return filesystem_context_.get();
@@ skipping 408 matching lines @@
   media_url_request_context_ = media_url_request_context;
 }
 
 void StoragePartitionImpl::GetQuotaSettings(
     storage::OptionalQuotaSettingsCallback callback) {
   GetContentClient()->browser()->GetQuotaSettings(browser_context_, this,
                                                   std::move(callback));
 }
 
 }  // namespace content