Don't disable MemoryPressureListener when MemoryCoordinator is enabled

content/browser/browser_main_loop.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_main_loop.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 799 matching lines @@
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   // Note that we do not initialize a new FeatureList when calling this for
   // the second time.
   base::FeatureList::InitializeInstance(
       command_line->GetSwitchValueASCII(switches::kEnableFeatures),
       command_line->GetSwitchValueASCII(switches::kDisableFeatures));
 
   InitializeMemoryManagementComponent();
 
-  if (base::FeatureList::IsEnabled(features::kMemoryCoordinator))
-    MemoryCoordinatorImpl::GetInstance()->Start();
-
 #if defined(OS_MACOSX)
   if (base::CommandLine::InitializedForCurrentProcess() &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableHeapProfiling)) {
     base::allocator::PeriodicallyShimNewMallocZones();
   }
 #endif
 
 #if BUILDFLAG(ENABLE_PLUGINS)
   // Prior to any processing happening on the IO thread, we create the
@@ skipping 764 matching lines @@
             chromeos::switches::GetMemoryPressureThresholds());
   }
 #elif defined(OS_MACOSX)
   memory_pressure_monitor_ =
     base::MakeUnique<base::mac::MemoryPressureMonitor>();
 #elif defined(OS_WIN)
   memory_pressure_monitor_ =
       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)
     swap_metrics_observer->Start();
 }
 
 bool BrowserMainLoop::InitializeToolkit() {
   TRACE_EVENT0("startup", "BrowserMainLoop::InitializeToolkit");
 
   // TODO(evan): this function is rather subtle, due to the variety
@@ skipping 150 matching lines @@
         base::MakeUnique<media::AudioThreadImpl>(),
         MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
 
   audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
   CHECK(audio_system_);
 }
 
 }  // namespace content