Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7487)

Unified Diff: chrome/test/base/testing_browser_process.cc

Issue 7628006: GTTF: Use a fresh TestingBrowserProcess for each test, part #6 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index fb2f1d4dbd4ec5c619d368e3d3a40488cd169b8c..96f5a2c48ae05a08308526806de6f277420de1b2 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -269,7 +269,7 @@ void TestingBrowserProcess::SetDevToolsManager(DevToolsManager* manager) {
}
ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() {
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// 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);
@@ -289,7 +289,7 @@ ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() {
ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() {
DCHECK_EQ(browser_process_.get(), g_browser_process);
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// 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;
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698