Move MemoryPressureObserverChromeOS instantiation from Chrome to Content

content/browser/browser_main_loop.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "content/browser/browser_process_sub_thread.h"
 #include "content/public/browser/browser_main_runner.h"
 
 namespace base {
 class CommandLine;
 class FilePath;
 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;
 }  // namespace debug
 }  // namespace base
 
 namespace media {
 class AudioManager;
 class MidiManager;
 class UserInputMonitor;
@@ skipping 75 matching lines @@
     return startup_trace_file_;
   }
 
   void StopStartupTracingTimer();
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   DeviceMonitorMac* device_monitor_mac() const {
     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;
   // For ShutdownThreadsAndCleanUp.
   friend class BrowserShutdownImpl;
 
   void InitializeMainThread();
 
   // Called just before creating the threads
   int PreCreateThreads();
@@ skipping 37 matching lines @@
   scoped_ptr<SystemMessageWindowWin> system_message_window_;
 #elif defined(USE_UDEV)
   scoped_ptr<DeviceMonitorLinux> device_monitor_linux_;
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
   scoped_ptr<DeviceMonitorMac> device_monitor_mac_;
 #endif
 #if defined(OS_ANDROID)
   // 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_;
 
   // Destroy parts_ before main_message_loop_ (required) and before other
   // classes constructed in content (but after main_thread_).
   scoped_ptr<BrowserMainParts> parts_;
 
   // Members initialized in |InitializeMainThread()| ---------------------------
   // This must get destroyed before other threads that are created in parts_.
   scoped_ptr<BrowserThreadImpl> main_thread_;
@@ skipping 20 matching lines @@
 
   // This timer initiates trace file saving.
   base::OneShotTimer<BrowserMainLoop> startup_trace_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_