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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing 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
« chrome/test/base/chrome_test_suite.cc ('K') | « chrome/test/base/chrome_test_suite.cc ('k') | chrome/test/base/testing_browser_process.h » ('j') | content/browser/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/in_process_browser_test.cc
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 52cebdd6f604ab616a20be3035abe00e6fcb44bf..d8d621f9a5d6f2de419f14807bd142be9716577a 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -95,7 +95,11 @@ void InProcessBrowserTest::SetUp() {
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.
« chrome/test/base/chrome_test_suite.cc ('K') | « chrome/test/base/chrome_test_suite.cc ('k') | chrome/test/base/testing_browser_process.h » ('j') | content/browser/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698