Switch ChromeTestSuite to the same convention as ContentTestSuite:

chrome/test/base/in_process_browser_test.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/test/base/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 77 matching lines @@
 }
 
 InProcessBrowserTest::~InProcessBrowserTest() {
 }
 
 void InProcessBrowserTest::SetUp() {
   // Create a temporary user data directory if required.
   ASSERT_TRUE(CreateUserDataDirectory())
       << "Could not create user data directory.";
 
-  DCHECK(!g_browser_process);
+  // Undo TestingBrowserProcess creation in ChromeTestSuite.
+  // TODO(phajdan.jr): Extract a smaller test suite so we don't need this.
+  DCHECK(g_browser_process);
+  delete g_browser_process;
+  g_browser_process = NULL;
 
   // Allow subclasses the opportunity to make changes to the default user data
   // dir before running any tests.
   ASSERT_TRUE(SetUpUserDataDirectory())
       << "Could not set up user data directory.";
 
   // Don't delete the resources when BrowserMain returns. Many ui classes
   // cache SkBitmaps in a static field so that if we delete the resource
   // bundle we'll crash.
   browser_shutdown::delete_resources_on_shutdown = false;
@@ skipping 239 matching lines @@
     return;
 
   // Invoke CloseAllBrowsersAndMayExit on a running message loop.
   // CloseAllBrowsersAndMayExit exits the message loop after everything has been
   // shut down properly.
   MessageLoopForUI::current()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&BrowserList::AttemptExit));
   ui_test_utils::RunMessageLoop();
 }