Move shutdown code to avoid crash in WarmConnectionFieldTrial_WarmestSocket

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 70 matching lines @@
 
 static base::LazyInstance<MessageLoopObserver> g_message_loop_observer =
     LAZY_INSTANCE_INITIALIZER;
 
 ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainPartsLinux(parameters) {
 }
 
 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
-  chromeos::accessibility::SystemEventObserver::Shutdown();
-
   chromeos::disks::DiskMountManager::Shutdown();
 
-  chromeos::BluetoothManager::Shutdown();
-
   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 108 matching lines @@
   // 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());
   }
+
+  // Shut these down here instead of in the destructor in case we exited before
+  // running BrowserMainLoop::RunMainMessageLoopParts() and never initialized
+  // these.
+  chromeos::accessibility::SystemEventObserver::Shutdown();
+  chromeos::BluetoothManager::Shutdown();
 }