GTTF: Use a fresh TestingBrowserProcess for each test, part #5

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/file_path.h"
 #include "base/file_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ skipping 76 matching lines @@
 }
 
 InProcessBrowserTest::~InProcessBrowserTest() {
 }
 
 void InProcessBrowserTest::SetUp() {
   // Create a temporary user data directory if required.
   ASSERT_TRUE(CreateUserDataDirectory())
       << "Could not create user data directory.";
 
+#if defined(OS_WIN)
+  // This is not really Windows-specific, the transition is just being done
+  // in stages, and Windows is first. See below for more info.
+  DCHECK(!g_browser_process);
+#else
+  // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
   // The unit test suite creates a testingbrowser, but we want the real thing.
   // Delete the current one. We'll install the testing one in TearDown.
   delete g_browser_process;
   g_browser_process = NULL;
+#endif
 
   // 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 100 matching lines @@
     } else {
       LOG(ERROR) << "Could not create temporary user data directory \""
                  << temp_user_data_dir_.path().value() << "\".";
       return false;
     }
   }
   return test_launcher_utils::OverrideUserDataDir(user_data_dir);
 }
 
 void InProcessBrowserTest::TearDown() {
+#if defined(OS_WIN)
+  // This is not really Windows-specific, the transition is just being done
+  // in stages, and Windows is first. See below for more info.
+  DCHECK(!g_browser_process);
+#else
+  // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
   // Reinstall testing browser process.
   delete g_browser_process;
   g_browser_process = new TestingBrowserProcess();
+#endif
 
   browser_shutdown::delete_resources_on_shutdown = true;
 
 #if defined(OS_WIN)
   BrowserFrameWin::SetShowState(-1);
 #endif
 }
 
 void InProcessBrowserTest::AddTabAtIndexToBrowser(
     Browser* browser,
@@ skipping 111 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();
 }