Move MemoryPressureObserverChromeOS instantiation from Chrome to Content

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/chromeos/memory_pressure_observer_chromeos.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/linux_util.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/sys_info.h"
 #include "base/task_runner_util.h"
@@ skipping 301 matching lines @@
 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopStart() {
   // Replace the default NetworkChangeNotifierFactory with ChromeOS specific
   // implementation. This must be done before BrowserMainLoop calls
   // net::NetworkChangeNotifier::Create() in MainMessageLoopStart().
   net::NetworkChangeNotifier::SetFactory(
       new NetworkChangeNotifierFactoryChromeos());
   ChromeBrowserMainPartsLinux::PreMainMessageLoopStart();
 }
 
 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
-  // Instantiate the MemoryPressureObserver.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kUseMemoryPressureSystemChromeOS)) {
-    memory_pressure_observer_.reset(new base::MemoryPressureObserverChromeOS);
-  }
-
   base::FilePath user_data_dir;
   if (!base::SysInfo::IsRunningOnChromeOS() &&
       PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
     // Override some paths with stub locations so that cloud policy and
     // enterprise enrollment work on desktop builds, for ease of
     // development.
     chromeos::RegisterStubPathOverrides(user_data_dir);
   }
 
   dbus_services_.reset(new internal::DBusServices(parameters()));
@@ skipping 349 matching lines @@
   keyboard_event_rewriters_->Init();
 #endif
 
   ChromeBrowserMainPartsLinux::PostBrowserStart();
 }
 
 // Shut down services before the browser process, etc are destroyed.
 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
   BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
 
-  // Remove the MemoryPressureObserver since it is not needed anymore.
-  memory_pressure_observer_.reset();
-
   g_browser_process->platform_part()->oom_priority_manager()->Stop();
 
   // Early wake-up of HID device service.
   InputServiceProxy::WarmUp();
 
   // Destroy the application name notifier for Kiosk mode.
   KioskModeIdleAppNameNotification::Shutdown();
 
   // Shutdown the upgrade detector for Chrome OS. The upgrade detector
   // stops monitoring changes from the update engine.
@@ skipping 110 matching lines @@
   // Destroy DBus services immediately after threads are stopped.
   dbus_services_.reset();
 
   ChromeBrowserMainPartsLinux::PostDestroyThreads();
 
   // Destroy DeviceSettingsService after g_browser_process.
   DeviceSettingsService::Shutdown();
 }
 
 }  //  namespace chromeos