Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1489)

Unified Diff: content/browser/storage_partition_impl.cc

Issue 2968293002: Introduce SystemNetworkContextManager. (Closed)
Patch Set: Response to comments Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/loader/url_loader_factory_impl_unittest.cc ('k') | content/network/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/storage_partition_impl.cc
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index 2ad03f42856a94b9a4a15507ac04c385db0fe18f..9b1e53ea8ec6cb93abb6d81f31529c132302f1f0 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -31,12 +31,11 @@
#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 "content/public/common/service_manager_connection.h"
-#include "content/public/common/service_names.mojom.h"
#include "net/base/completion_callback.h"
#include "net/base/net_errors.h"
#include "net/cookies/canonical_cookie.h"
@@ -532,20 +531,13 @@ std::unique_ptr<StoragePartitionImpl> StoragePartitionImpl::Create(
ChromeBlobStorageContext::GetFor(context);
if (base::FeatureList::IsEnabled(features::kNetworkService)) {
- static mojom::NetworkServicePtr* g_network_service =
- new mojom::NetworkServicePtr;
- if (!g_network_service->is_bound()) {
- ServiceManagerConnection::GetForProcess()->GetConnector()->BindInterface(
- mojom::kNetworkServiceName, g_network_service);
- }
mojom::NetworkContextParamsPtr context_params =
mojom::NetworkContextParams::New();
// TODO: fill this
// context_params->cache_dir =
// context_params->cookie_path =
- (*g_network_service)
- ->CreateNetworkContext(MakeRequest(&partition->network_context_),
- std::move(context_params));
+ GetNetworkService()->CreateNetworkContext(
+ MakeRequest(&partition->network_context_), std::move(context_params));
BlobURLLoaderFactory::BlobContextGetter blob_getter =
base::BindOnce(&BlobStorageContextGetter, blob_context);
« no previous file with comments | « content/browser/loader/url_loader_factory_impl_unittest.cc ('k') | content/network/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698