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

Unified Diff: chrome/browser/chromeos/login/login_browsertest.cc

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: cleanup Created 6 years, 9 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
Index: chrome/browser/chromeos/login/login_browsertest.cc
===================================================================
--- chrome/browser/chromeos/login/login_browsertest.cc (revision 257128)
+++ chrome/browser/chromeos/login/login_browsertest.cc (working copy)
@@ -126,13 +126,13 @@
command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
}
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpOnMainThread() OVERRIDE {
content_browser_client_.reset(new TestContentBrowserClient());
original_content_browser_client_ = content::SetBrowserClientForTesting(
content_browser_client_.get());
}
- virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
+ virtual void CleanUpOnMainThread() OVERRIDE {
content::SetBrowserClientForTesting(original_content_browser_client_);
}

Powered by Google App Engine
This is Rietveld 408576698