Migrate ChromeOS to base::MemoryPressureMonitor

content/browser/browser_main_loop.h

Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 5050cd0cde34ae88635651942ffc3a6cd6c59fe7..e3fc5db34864d95140c8c412aa1be4618d58e987 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -21,7 +21,7 @@ class MessageLoop;
 class PowerMonitor;
 class SystemMonitor;
 #if defined(OS_CHROMEOS)
-class MemoryPressureObserverChromeOS;
+class MemoryPressureMonitorChromeOS;
 #endif
 namespace trace_event {
 class TraceMemoryController;
@@ -118,12 +118,6 @@ class CONTENT_EXPORT BrowserMainLoop {
     return device_monitor_mac_.get();
   }
 #endif
-#if defined(OS_CHROMEOS)
-  // Return the MemoryPressureObserver which might be NULL.
-  base::MemoryPressureObserverChromeOS* memory_pressure_observer() {
-    return memory_pressure_observer_.get();
-  }
-#endif
 
  private:
   class MemoryObserver;
@@ -185,7 +179,7 @@ class CONTENT_EXPORT BrowserMainLoop {
   scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_;
 #endif
 #if defined(OS_CHROMEOS)
-  scoped_ptr<base::MemoryPressureObserverChromeOS> memory_pressure_observer_;
+  scoped_ptr<base::MemoryPressureMonitorChromeOS> memory_pressure_observer_;

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

Could get rid of the OS_CHROMEOS ifdefs and make this a
scoped_ptr<base::MemoryPressureMonitor> instance? (This could be done in a later
CL, but will be needed when we start using this on other platforms.)

Should also change the name to reflect _monitor_ and not _observer_.

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

Something somewhere will have to be able to choose the right concrete
MemoryPressureObserver implementation for the given process+platform (or we use
a factory like you had proposed). In any case, I think it makes sense to keep
this CL simple and ChromeOS-only.
Done, thanks.

 #endif
   // The startup task runner is created by CreateStartupTasks()
   scoped_ptr<StartupTaskRunner> startup_task_runner_;