Move MemoryPressureObserverChromeOS instantiation from Chrome to Content

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 188aa3209d31e0043cd7e6fb247dd70fba4bb413..4a87f872a6e88226b2c0122fa2e6d27e1a3df85e 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -20,6 +20,9 @@ class HighResolutionTimerManager;
 class MessageLoop;
 class PowerMonitor;
 class SystemMonitor;
+#if defined(OS_CHROMEOS)

[Charlie Reis, 2014/12/15 21:52:09]

This belongs with the OS-specific blocks below.

[Mr4D (OOO till 08-26), 2014/12/15 22:21:46]

Note: base::MemoryPressureObserverChromeOS.

The OS-specific block is in content::...

Or did you suggest to end the namespace there again and restart it once more?

[Charlie Reis, 2014/12/15 22:50:26]

Ah, no, I missed the base:: part.  Apologies!

+class MemoryPressureObserverChromeOS;
+#endif
 namespace debug {
 class TraceMemoryController;
 class TraceEventSystemStatsMonitor;
@@ -115,6 +118,12 @@ 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;
@@ -172,6 +181,9 @@ class CONTENT_EXPORT BrowserMainLoop {
   // Android implementation of ScreenOrientationDelegate
   scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_;
 #endif
+#if defined(OS_CHROMEOS)
+  scoped_ptr<base::MemoryPressureObserverChromeOS> memory_pressure_observer_;
+#endif
   // The startup task runner is created by CreateStartupTasks()
   scoped_ptr<StartupTaskRunner> startup_task_runner_;