Move shutdown code to avoid crash in WarmConnectionFieldTrial_WarmestSocket

chrome/browser/chrome_browser_main_unittest.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 <string>
 #include <vector>
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/main_function_params.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class BrowserMainTest : public testing::Test {
  public:
   BrowserMainTest() : command_line_(CommandLine::NO_PROGRAM) {}
 
  protected:
   TestingPrefService pref_service_;
   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(
       new content::MainFunctionParams(command_line_));
   scoped_ptr<content::BrowserMainParts> bw(
       content::GetContentClient()->browser()->CreateBrowserMainParts(*params));
   ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get());
   EXPECT_TRUE(cbw);
   if (cbw) {
     cbw->WarmConnectionFieldTrial();
     EXPECT_EQ(0, net::GetSocketReusePolicy());
   }
 }
 
-// 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(
       content::GetContentClient()->browser()->CreateBrowserMainParts(*params));
   ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get());
   EXPECT_TRUE(cbw);
   if (cbw) {
     const int kNumRuns = 1000;
     for (int i = 0; i < kNumRuns; i++) {
       cbw->WarmConnectionFieldTrial();
       int val = net::GetSocketReusePolicy();
       EXPECT_LE(val, 2);
       EXPECT_GE(val, 0);
     }
   }
 }
 
-// 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(
       new content::MainFunctionParams(command_line_));
   // This test ends up launching a new process, and that doesn't initialize the
   // ContentClient interfaces.
   scoped_ptr<content::BrowserMainParts> bw;
   if (content::GetContentClient()) {
     bw.reset(content::GetContentClient()->browser()->CreateBrowserMainParts(
         *params));
   } else {
     chrome::ChromeContentBrowserClient ccbc;
     bw.reset(ccbc.CreateBrowserMainParts(*params));
   }
   ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get());
   EXPECT_TRUE(cbw);
   if (cbw) {
 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
     EXPECT_DEATH(cbw->WarmConnectionFieldTrial(),
                  "Not a valid socket reuse policy group");
 #else
     EXPECT_DEBUG_DEATH(cbw->WarmConnectionFieldTrial(),
                        "Not a valid socket reuse policy group");
 #endif
   }
 }