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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2883693002: [Memory-UMA] Implement basic working prototype. (Closed)
Patch Set: Fix test. Created 3 years, 7 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
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 3b4128fccff1188906bae3c2f9a76a7af4fc0815..0d880dfc3f5a81f5a587e2ea7fadc950c2b74c0e 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -797,14 +797,6 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
LevelDBWrapperImpl::EnableAggressiveCommitDelay();
}
- // Create the memory instrumentation service. It will initialize the memory
- // dump manager, too. It makes sense that BrowserMainLoop owns the service;
- // this way, the service is alive for the lifetime of Mojo. Mojo is shutdown
- // in BrowserMainLoop::ShutdownThreadsAndCleanupIO.
- memory_instrumentation_coordinator_ =
- base::MakeUnique<memory_instrumentation::CoordinatorImpl>(
- true /* initialize_memory_dump_manager */);
-
// Enable memory-infra dump providers.
InitSkiaEventTracer();
tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess(
@@ -1399,6 +1391,15 @@ int BrowserMainLoop::BrowserThreadsStarted() {
// so this cannot happen any earlier than now.
InitializeMojo();
+ // Create the memory instrumentation service. It will initialize the memory
+ // dump manager, too. It makes sense that BrowserMainLoop owns the service;
+ // this way, the service is alive for the lifetime of Mojo. Mojo is shutdown
+ // in BrowserMainLoop::ShutdownThreadsAndCleanupIO.
+ memory_instrumentation_coordinator_ =
+ base::MakeUnique<memory_instrumentation::CoordinatorImpl>(
+ true /* initialize_memory_dump_manager */,
+ content::ServiceManagerConnection::GetForProcess()->GetConnector());
+
#if defined(USE_AURA)
if (service_manager::ServiceManagerIsRemote()) {
base::CommandLine::ForCurrentProcess()->AppendSwitch(

Powered by Google App Engine
This is Rietveld 408576698