Migrate ChromeOS to base::MemoryPressureMonitor

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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 85 matching lines @@
 #include <commctrl.h>
 #include <shellapi.h>
 
 #include "content/browser/system_message_window_win.h"
 #include "content/common/sandbox_win.h"
 #include "net/base/winsock_init.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "base/chromeos/memory_pressure_observer_chromeos.h"
+#include "base/chromeos/memory_pressure_monitor_chromeos.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(USE_GLIB)
 #include <glib-object.h>
 #endif
 
 #if defined(OS_LINUX) && defined(USE_UDEV)
 #include "content/browser/device_monitor_udev.h"
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
@@ skipping 465 matching lines @@
 }
 
 int BrowserMainLoop::PreCreateThreads() {
   if (parts_) {
     TRACE_EVENT0("startup",
         "BrowserMainLoop::CreateThreads:PreCreateThreads");
     result_code_ = parts_->PreCreateThreads();
   }
 
 #if defined(OS_CHROMEOS)
   if (chromeos::switches::MemoryPressureHandlingEnabled()) {

[chrisha, 2015/04/08 21:38:16]

Hmm... might need to promote this to a pan-OS switch. Another CL, I suppose...

[dmichael (off chromium), 2015/04/08 22:09:03]

Perhaps. It's just "always on" for Android I think, and of course there is no
pressure handling on Mac/Win. Stefan should know about the history of this flag
to inform whether it needs to work for other platforms.

-    memory_pressure_observer_.reset(new base::MemoryPressureObserverChromeOS(
+    memory_pressure_observer_.reset(new base::MemoryPressureMonitorChromeOS(
         chromeos::switches::GetMemoryPressureThresholds()));
   }
 #endif
 
 #if defined(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.
   {
@@ skipping 673 matching lines @@
 
 void BrowserMainLoop::EndStartupTracing() {
   is_tracing_startup_ = false;
   TracingController::GetInstance()->DisableRecording(
       TracingController::CreateFileSink(
           startup_trace_file_,
           base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
 }
 
 }  // namespace content