Merge MemoryCoordinator and MemoryCoordinatorImpl into one class

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 49 matching lines @@
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/gpu/shader_cache_factory.h"
 #include "content/browser/histogram_synchronizer.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader_delegate_impl.h"
 #include "content/browser/media/media_internals.h"
-#include "content/browser/memory/memory_coordinator.h"
+#include "content/browser/memory/memory_coordinator_impl.h"
 #include "content/browser/net/browser_online_state_observer.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/service_manager/service_manager_context.h"
 #include "content/browser/speech/speech_recognition_manager_impl.h"
 #include "content/browser/startup_task_runner.h"
 #include "content/browser/utility_process_host_impl.h"
 #include "content/browser/webui/content_web_ui_controller_factory.h"
 #include "content/browser/webui/url_data_manager.h"
 #include "content/common/content_switches_internal.h"
@@ skipping 780 matching lines @@
       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))
-    MemoryCoordinator::GetInstance()->Start();
+    MemoryCoordinatorImpl::GetInstance()->Start();
 
 #if BUILDFLAG(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,
   // but must be created on the main thread. The service ctor is
   // inexpensive and does not invoke the io_thread() accessor.
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::CreateThreads:PluginService");
     PluginService::GetInstance()->Init();
   }
@@ skipping 734 matching lines @@
       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())));
+            &MemoryCoordinatorImpl::GetCurrentMemoryState,
+            base::Unretained(MemoryCoordinatorImpl::GetInstance())));
     base::MemoryCoordinatorProxy::GetInstance()->
         SetSetCurrentMemoryStateForTestingCallback(base::Bind(
-            &MemoryCoordinator::SetCurrentMemoryStateForTesting,
-            base::Unretained(MemoryCoordinator::GetInstance())));
+            &MemoryCoordinatorImpl::SetCurrentMemoryStateForTesting,
+            base::Unretained(MemoryCoordinatorImpl::GetInstance())));
 
     if (memory_pressure_monitor_) {
       memory_pressure_monitor_->SetDispatchCallback(
-          base::Bind(&MemoryCoordinator::RecordMemoryPressure,
-                     base::Unretained(MemoryCoordinator::GetInstance())));
+          base::Bind(&MemoryCoordinatorImpl::RecordMemoryPressure,
+                     base::Unretained(MemoryCoordinatorImpl::GetInstance())));
     }
   }
 }
 
 bool BrowserMainLoop::InitializeToolkit() {
   TRACE_EVENT0("startup", "BrowserMainLoop::InitializeToolkit");
 
   // TODO(evan): this function is rather subtle, due to the variety
   // of intersecting ifdefs we have.  To keep it easy to follow, there
   // are no #else branches on any #ifs.
@@ skipping 146 matching lines @@
   if (!audio_manager_) {
     audio_thread_ = base::MakeUnique<AudioManagerThread>();
     audio_manager_ = media::AudioManager::Create(
         audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
         MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
 }
 
 }  // namespace content