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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More merge to ToT. 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
« chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc ('K') | « chrome/browser/chromeos/login/existing_user_controller_browsertest.cc ('k') | chrome/browser/chromeos/login/login_manager_test.h » ('j') | chrome/browser/chromeos/login/managed/managed_user_test_base.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 c0f0451410c35e9166972032429630030e966789..a6860e03b3b9b33779132ba8c49cc6335023167a 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -250,11 +250,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.
« chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc ('K') | « chrome/browser/chromeos/login/existing_user_controller_browsertest.cc ('k') | chrome/browser/chromeos/login/login_manager_test.h » ('j') | chrome/browser/chromeos/login/managed/managed_user_test_base.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698