Move shutdown code to avoid crash in WarmConnectionFieldTrial_WarmestSocket

chrome/browser/chrome_browser_main_unittest.cc

Index: chrome/browser/chrome_browser_main_unittest.cc
diff --git a/chrome/browser/chrome_browser_main_unittest.cc b/chrome/browser/chrome_browser_main_unittest.cc
index 3b3272a5242ae37cd0d5e0111558d2811d4ac57d..f5c549b3223d9792964b88d6a627487f1ffe8d00 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(