Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index a3db3aaf91d97c0307503e8835f1348fe404fd8c..be43ea2c66bbe393a9465ac7ac3bed19d113f9c3 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -103,6 +103,7 @@ |
#include "net/socket/client_socket_factory.h" |
#include "net/ssl/ssl_config_service.h" |
#include "ppapi/features/features.h" |
+#include "services/resource_coordinator/memory/coordinator/coordinator_impl.h" |
#include "services/service_manager/runner/common/client_util.h" |
#include "skia/ext/event_tracer_impl.h" |
#include "skia/ext/skia_memory_dump_provider.h" |
@@ -833,6 +834,14 @@ 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( |