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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc

Issue 419523003: Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/browser/chromeos/customization_wallpaper_downloader_browsertest.cc ('k') | chrome/browser/chromeos/login/existing_user_controller_browsertest.cc » ('j') | chrome/browser/sessions/session_restore_browsertest_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc
diff --git a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc
index da4f118fd29f85c8d8f956f310fd701c93decaf2..cbb3f5f0d8bd5345919189b7022eb7bdccd21eaf 100644
--- a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc
+++ b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc
@@ -53,7 +53,7 @@ class DriveFirstRunTest : public InProcessBrowserTest,
// InProcessBrowserTest overrides:
virtual void SetUpOnMainThread() OVERRIDE;
- virtual void CleanUpOnMainThread() OVERRIDE;
+ virtual void TearDownOnMainThread() OVERRIDE;
// DriveFirstRunController::Observer overrides:
virtual void OnCompletion(bool success) OVERRIDE;
@@ -102,8 +102,7 @@ void DriveFirstRunTest::SetUpOnMainThread() {
controller_->SetAppInfoForTest(kTestAppId, kTestEndpointUrl);
}
-void DriveFirstRunTest::CleanUpOnMainThread() {
- InProcessBrowserTest::CleanUpOnMainThread();
+void DriveFirstRunTest::TearDownOnMainThread() {
content::RunAllPendingInMessageLoop();
}
« no previous file with comments | « chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc ('k') | chrome/browser/chromeos/login/existing_user_controller_browsertest.cc » ('j') | chrome/browser/sessions/session_restore_browsertest_chromeos.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698