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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2261073002: Make HistoryBackend a client of memory coordinator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: singleton Created 4 years, 4 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 309e4eb4e5e5b5e14bfe5361916cab4e875f1020..736d6aefb727b1a3e2e1109787edb90fa0a33dd9 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -715,9 +715,8 @@ int BrowserMainLoop::PreCreateThreads() {
parsed_command_line_));
#endif
- if (memory_coordinator::IsEnabled()) {
- memory_coordinator_.reset(new memory_coordinator::MemoryCoordinator);
- }
+ // Make sure memory coordinator is initialized.
+ memory_coordinator::MemoryCoordinator::GetInstance();
jam 2016/08/23 17:37:16 why is this needed? the constructor of MC doesn't
bashi 2016/08/24 23:33:28 Done.
#if defined(ENABLE_PLUGINS)
// Prior to any processing happening on the IO thread, we create the
@@ -1020,7 +1019,6 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
}
memory_pressure_monitor_.reset();
- memory_coordinator_.reset();
#if defined(OS_MACOSX)
BrowserCompositorMac::DisableRecyclingForShutdown();

Powered by Google App Engine
This is Rietveld 408576698