Stop using callbacks in MemoryCoordinatorProxy

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 <string>
 #include <utility>
@@ skipping 1510 matching lines @@
   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);
-    // base::Unretained is safe because the lifetime of MemoryCoordinator is
-    // tied to the lifetime of the browser process.
-    base::MemoryCoordinatorProxy::GetInstance()->
-        SetGetCurrentMemoryStateCallback(base::Bind(
-            &MemoryCoordinator::GetCurrentMemoryState,
-            base::Unretained(MemoryCoordinator::GetInstance())));
-    base::MemoryCoordinatorProxy::GetInstance()->
-        SetSetCurrentMemoryStateForTestingCallback(base::Bind(
-            &MemoryCoordinator::SetCurrentMemoryStateForTesting,
-            base::Unretained(MemoryCoordinator::GetInstance())));
+    base::MemoryCoordinatorProxy::GetInstance()->Set(
+        MemoryCoordinator::GetInstance()->GetWeakPtr());
 
     if (memory_pressure_monitor_) {
       memory_pressure_monitor_->SetDispatchCallback(
           base::Bind(&MemoryCoordinator::RecordMemoryPressure,
                      base::Unretained(MemoryCoordinator::GetInstance())));
     }
   }
 }
 
 bool BrowserMainLoop::InitializeToolkit() {
@@ skipping 150 matching lines @@
   if (!audio_manager_) {
     audio_thread_ = base::MakeUnique<AudioDeviceThread>();
     audio_manager_ = media::AudioManager::Create(
         audio_thread_->GetTaskRunner(), audio_thread_->worker_task_runner(),
         MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
 }
 
 }  // namespace content