| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 2368fbdec1e671590a1c3e95c80e566ff2787fab..dd8a09059975f011ec3ed883e9e461d46979d552 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -36,6 +36,8 @@
|
| #include "base/trace_event/memory_dump_manager.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "build/build_config.h"
|
| +#include "components/memory_coordinator/browser/memory_coordinator.h"
|
| +#include "components/memory_coordinator/common/memory_coordinator_features.h"
|
| #include "components/tracing/browser/trace_config_file.h"
|
| #include "components/tracing/common/process_metrics_memory_dump_provider.h"
|
| #include "components/tracing/common/trace_to_console.h"
|
| @@ -721,6 +723,10 @@ int BrowserMainLoop::PreCreateThreads() {
|
| parsed_command_line_));
|
| #endif
|
|
|
| + if (memory_coordinator::IsEnabled()) {
|
| + memory_coordinator_.reset(new memory_coordinator::MemoryCoordinator);
|
| + }
|
| +
|
| #if defined(ENABLE_PLUGINS)
|
| // Prior to any processing happening on the IO thread, we create the
|
| // plugin service as it is predominantly used from the IO thread,
|
| @@ -997,6 +1003,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
|
| }
|
|
|
| memory_pressure_monitor_.reset();
|
| + memory_coordinator_.reset();
|
|
|
| #if defined(OS_MACOSX)
|
| BrowserCompositorMac::DisableRecyclingForShutdown();
|
|
|