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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2943953002: Don't disable MemoryPressureListener when MemoryCoordinator is enabled (Closed)
Patch Set: Fix namespace Created 3 years, 6 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 2e16dfd6b7d413e798ca2876abc2c618c06995b8..1d0435f01c59df2d05f515f41797fd17fa26ba8f 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -815,9 +815,6 @@ int BrowserMainLoop::PreCreateThreads() {
InitializeMemoryManagementComponent();
- if (base::FeatureList::IsEnabled(features::kMemoryCoordinator))
- MemoryCoordinatorImpl::GetInstance()->Start();
-
#if defined(OS_MACOSX)
if (base::CommandLine::InitializedForCurrentProcess() &&
base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -1586,16 +1583,8 @@ void BrowserMainLoop::InitializeMemoryManagementComponent() {
CreateWinMemoryPressureMonitor(parsed_command_line_);
#endif
- if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) {
- // Disable MemoryPressureListener when memory coordinator is enabled.
- base::MemoryPressureListener::SetNotificationsSuppressed(true);
- auto* coordinator = MemoryCoordinatorImpl::GetInstance();
- if (memory_pressure_monitor_) {
- memory_pressure_monitor_->SetDispatchCallback(
- base::Bind(&MemoryCoordinatorImpl::RecordMemoryPressure,
- base::Unretained(coordinator)));
- }
- }
+ if (base::FeatureList::IsEnabled(features::kMemoryCoordinator))
+ MemoryCoordinatorImpl::GetInstance()->Start();
auto* swap_metrics_observer = SwapMetricsObserver::GetInstance();
if (swap_metrics_observer)

Powered by Google App Engine
This is Rietveld 408576698