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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/kiosk_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/login/existing_user_controller_browsertest.cc ('k') | chrome/browser/chromeos/login/login_manager_test.h » ('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/login/kiosk_browsertest.cc
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index 4bf1f4a12da223db123eaba0a3206ace8ed30724..a3825079b588b1e0aced585c5a857eb8ae3c0565 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -253,11 +253,11 @@ class KioskTest : public OobeBaseTest {
OobeBaseTest::TearDown();
}
- virtual void CleanUpOnMainThread() OVERRIDE {
+ virtual void TearDownOnMainThread() OVERRIDE {
AppLaunchController::SetNetworkTimeoutCallbackForTesting(NULL);
AppLaunchSigninScreen::SetUserManagerForTesting(NULL);
- OobeBaseTest::CleanUpOnMainThread();
+ OobeBaseTest::TearDownOnMainThread();
// Clean up while main thread still runs.
// See http://crbug.com/176659.
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller_browsertest.cc ('k') | chrome/browser/chromeos/login/login_manager_test.h » ('j') | chrome/browser/sessions/session_restore_browsertest_chromeos.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698