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

chrome/test/testing_browser_process.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/testing_browser_process.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
@@ skipping 251 matching lines @@
 
 void TestingBrowserProcess::SetIOThread(IOThread* io_thread) {
   io_thread_ = io_thread;
 }
 
 void TestingBrowserProcess::SetDevToolsManager(DevToolsManager* manager) {
   devtools_manager_.reset(manager);
 }
 
 ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() {
+#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.
   // ChromeTestSuite sets up a global TestingBrowserProcess
   // for all tests. We need to get rid of it, because it contains
   // a NotificationService, and there can be only one NotificationService
   // per thread.
   DCHECK(g_browser_process);
   delete g_browser_process;
-
+#endif
   browser_process_.reset(new TestingBrowserProcess);
   g_browser_process = browser_process_.get();
 }
 
 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() {
   DCHECK_EQ(browser_process_.get(), g_browser_process);
 
+#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.
+  g_browser_process = NULL;
+#else
   // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
   // After the transition is over, we should just
   // reset |g_browser_process| to NULL.
   browser_process_.reset();
   g_browser_process = new TestingBrowserProcess();
+#endif
 }