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

Unified Diff: content/browser/service_manager/service_manager_context.cc

Issue 2573283002: Use a static catalog manifest for the standalone Mash runner (Closed)
Patch Set: . Created 4 years 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 | « chrome/app/mash/mash_service_overrides.json ('k') | mash/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_manager/service_manager_context.cc
diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
index c6076ce6e0b7c1cb56f9c433032dd5dc5718b80d..fe9651229ad9bd52feadcd44ad6f4d7d5ed3f710 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -211,8 +211,8 @@ class ServiceManagerContext::InProcessServiceManagerContext
manifest_provider_ = std::move(manifest_provider);
base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool();
- catalog_ = base::MakeUnique<catalog::Catalog>(
- blocking_pool, nullptr, manifest_provider_.get());
+ catalog_.reset(
+ new catalog::Catalog(blocking_pool, manifest_provider_.get()));
service_manager_ = base::MakeUnique<service_manager::ServiceManager>(
base::MakeUnique<NullServiceProcessLauncherFactory>(),
catalog_->TakeService());
« no previous file with comments | « chrome/app/mash/mash_service_overrides.json ('k') | mash/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698