Move shutdown code to avoid crash in WarmConnectionFieldTrial_WarmestSocket

BUG=105326
TEST=Ensure unit_tests do not crash on chromeos

Review URL: http://codereview.chromium.org/8676028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111474 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 37 deletions

diff --git a/chrome/browser/chrome_browser_main_unittest.cc b/chrome/browser/chrome_browser_main_unittest.cc
index 3b3272a..f5c549b 100644
--- a/chrome/browser/chrome_browser_main_unittest.cc
+++ b/chrome/browser/chrome_browser_main_unittest.cc
@@ -25,17 +25,7 @@ class BrowserMainTest : public testing::Test {
   CommandLine command_line_;
 };
 
-// http://crbug.com/105326
-// Crashes unit_tests on "Linux Clang (ChromeOS dbg)".
-#if defined(OS_CHROMEOS)
-#define MAYBE_WarmConnectionFieldTrial_WarmestSocket \
-    DISABLED_WarmConnectionFieldTrial_WarmestSocket
-#else
-#define MAYBE_WarmConnectionFieldTrial_WarmestSocket \
-    WarmConnectionFieldTrial_WarmestSocket
-#endif
-
-TEST_F(BrowserMainTest, MAYBE_WarmConnectionFieldTrial_WarmestSocket) {
+TEST_F(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket) {
   command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "0");
 
   scoped_ptr<content::MainFunctionParams> params(
@@ -50,17 +40,7 @@ TEST_F(BrowserMainTest, MAYBE_WarmConnectionFieldTrial_WarmestSocket) {
   }
 }
 
-// http://crbug.com/105326
-// Crashes unit_tests on "Linux Clang (ChromeOS dbg)".
-#if defined(OS_CHROMEOS)
-#define MAYBE_WarmConnectionFieldTrial_Random \
-    DISABLED_WarmConnectionFieldTrial_Random
-#else
-#define MAYBE_WarmConnectionFieldTrial_Random \
-    WarmConnectionFieldTrial_Random
-#endif
-
-TEST_F(BrowserMainTest, MAYBE_WarmConnectionFieldTrial_Random) {
+TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) {
   scoped_ptr<content::MainFunctionParams> params(
       new content::MainFunctionParams(command_line_));
   scoped_ptr<content::BrowserMainParts> bw(
@@ -78,17 +58,7 @@ TEST_F(BrowserMainTest, MAYBE_WarmConnectionFieldTrial_Random) {
   }
 }
 
-// http://crbug.com/105326
-// Crashes unit_tests on "Linux Clang (ChromeOS dbg)".
-#if defined(OS_CHROMEOS)
-#define MAYBE_WarmConnectionFieldTrial_Invalid \
-    DISABLED_WarmConnectionFieldTrial_Invalid
-#else
-#define MAYBE_WarmConnectionFieldTrial_Invalid \
-    WarmConnectionFieldTrial_Invalid
-#endif
-
-TEST_F(BrowserMainTest, MAYBE_WarmConnectionFieldTrial_Invalid) {
+TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) {
   command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100");
 
   scoped_ptr<content::MainFunctionParams> params(
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 5d078d3..f6976dc 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -88,12 +88,8 @@ ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
 }
 
 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
-  chromeos::accessibility::SystemEventObserver::Shutdown();
-
   chromeos::disks::DiskMountManager::Shutdown();
 
-  chromeos::BluetoothManager::Shutdown();
-
   chromeos::DBusThreadManager::Shutdown();
 
   if (!parameters().ui_task && chromeos::CrosLibrary::Get())
@@ -222,4 +218,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
     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();
 }