Hook up ProfileIOData's URLRequestContext to a NetworkService.

chrome/browser/net/profile_network_context_service.cc

Index: chrome/browser/net/profile_network_context_service.cc
diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
new file mode 100644
index 0000000000000000000000000000000000000000..77c45a8a4608314ccc974a5ba18a91ddd6f56ba8
--- /dev/null
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -0,0 +1,66 @@
+// Copyright 2017 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 "chrome/browser/net/profile_network_context_service.h"
+
+#include "base/feature_list.h"
+#include "base/logging.h"
+#include "chrome/browser/profiles/profile.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/browser_thread.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/service_names.mojom.h"
+#include "mojo/public/cpp/bindings/associated_interface_ptr.h"
+
+namespace {
+
+content::mojom::NetworkContextParamsPtr CreateMainNetworkContextParams() {
+  // TODO(mmenke): Set up parameters here.
+  return content::mojom::NetworkContextParams::New();
+}
+
+}  // namespace
+
+ProfileNetworkContextService::ProfileNetworkContextService(Profile* profile)
+    : profile_(profile) {}
+
+ProfileNetworkContextService::~ProfileNetworkContextService() {}
+
+void ProfileNetworkContextService::SetUpProfileIODataMainContext(
+    content::mojom::NetworkContextRequest* network_context_request,
+    content::mojom::NetworkContextParamsPtr* network_context_params) {
+  DCHECK(!profile_io_data_main_network_context_);
+  *network_context_request =
+      mojo::MakeRequest(&profile_io_data_main_network_context_);
+  if (!base::FeatureList::IsEnabled(features::kNetworkService)) {
+    *network_context_params = CreateMainNetworkContextParams();
+  } else {
+    // Just use default if network service is enabled, to avoid the legacy
+    // in-process URLRequestContext from fighting with the NetworkService over
+    // ownership of on-disk files.
+    *network_context_params = content::mojom::NetworkContextParams::New();
+  }
+}
+
+content::mojom::NetworkContext* ProfileNetworkContextService::MainContext() {
+  // ProfileIOData must be initialized before this call.
+  DCHECK(profile_io_data_main_network_context_);
+  if (!base::FeatureList::IsEnabled(features::kNetworkService))
+    return profile_io_data_main_network_context_.get();
+
+  return content::BrowserContext::GetDefaultStoragePartition(profile_)
+      ->GetNetworkContext();
+}
+
+content::mojom::NetworkContextPtr
+ProfileNetworkContextService::CreateMainNetworkContext() {
+  DCHECK(base::FeatureList::IsEnabled(features::kNetworkService));
+
+  content::mojom::NetworkContextPtr network_context;
+  content::GetNetworkService()->CreateNetworkContext(
+      MakeRequest(&network_context), CreateMainNetworkContextParams());
+  return network_context;
+}