Add ChromeBrowserMainExtraParts for non main parts (take 2)

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 69 matching lines @@
 
 static base::LazyInstance<MessageLoopObserver> g_message_loop_observer =
     LAZY_INSTANCE_INITIALIZER;
 
 ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainPartsLinux(parameters) {
 }
 
 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
-  // Shutdown the upgrade detector for Chrome OS. The upgrade detector
-  // stops monitoring changes from the update engine.
-  if (UpgradeDetectorChromeos::GetInstance())
-    UpgradeDetectorChromeos::GetInstance()->Shutdown();
-
-  // Shutdown the network change notifier for Chrome OS. The network
-  // change notifier stops monitoring changes from the power manager and
-  // the network manager.
-  if (chromeos::CrosNetworkChangeNotifierFactory::GetInstance())
-    chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown();
-
   chromeos::disks::DiskMountManager::Shutdown();
 
   chromeos::BluetoothManager::Shutdown();
 
-  // We should remove observers attached to D-Bus clients before
-  // DBusThreadManager is shut down.
-  if (session_manager_observer_.get()) {
-    chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
-        RemoveObserver(session_manager_observer_.get());
-  }
-  if (brightness_observer_.get()) {
-    chromeos::DBusThreadManager::Get()->GetPowerManagerClient()
-        ->RemoveObserver(brightness_observer_.get());
-  }
-
   chromeos::DBusThreadManager::Shutdown();
 
   if (!parameters().ui_task && chromeos::CrosLibrary::Get())
     chromeos::CrosLibrary::Shutdown();
 
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
@@ skipping 36 matching lines @@
   // parsed command line until after about_flags::ConvertFlagsToSwitches has
   // been called.
   // TODO(vlaviano): Move this back to PostMainMessageLoopStart when we remove
   // the --enable-bluetooth flag.
   if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) {
     chromeos::BluetoothManager::Initialize();
   }
 }
 
 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
-  ChromeBrowserMainPartsPosix::PostMainMessageLoopStart();
+  ChromeBrowserMainPartsLinux::PostMainMessageLoopStart();
   MessageLoopForUI* message_loop = MessageLoopForUI::current();
   message_loop->AddObserver(g_message_loop_observer.Pointer());
 
   // Initialize DBusThreadManager for the browser. This must be done after
   // the main message loop is started, as it uses the message loop.
   chromeos::DBusThreadManager::Initialize();
 
   // Initialize the brightness observer so that we'll display an onscreen
   // indication of brightness changes during login.
   brightness_observer_.reset(new chromeos::BrightnessObserver());
@@ skipping 22 matching lines @@
     // Enable Num Lock on X start up.
       chromeos::input_method::InputMethodManager::GetInstance()->
           GetXKeyboard()->SetNumLockEnabled(true);
 
 #if defined(USE_AURA)
       initial_browser_window_observer_.reset(
           new chromeos::InitialBrowserWindowObserver);
 #endif
   }
 }
+
+// Shut down services before the browser process, etc are destroyed.
+void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
+  ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
+
+  // Shutdown the upgrade detector for Chrome OS. The upgrade detector
+  // stops monitoring changes from the update engine.
+  if (UpgradeDetectorChromeos::GetInstance())
+    UpgradeDetectorChromeos::GetInstance()->Shutdown();
+
+  // Shutdown the network change notifier for Chrome OS. The network
+  // change notifier stops monitoring changes from the power manager and
+  // the network manager.
+  if (chromeos::CrosNetworkChangeNotifierFactory::GetInstance())
+    chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown();
+
+  // We should remove observers attached to D-Bus clients before
+  // DBusThreadManager is shut down.
+  if (session_manager_observer_.get()) {
+    chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
+        RemoveObserver(session_manager_observer_.get());
+  }
+  if (brightness_observer_.get()) {
+    chromeos::DBusThreadManager::Get()->GetPowerManagerClient()
+        ->RemoveObserver(brightness_observer_.get());
+  }
+}