chrome/browser/chromeos/login/kiosk_browsertest.cc - Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Removed superfluous override. 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:

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 3adc4b0d655fe619ae628e9f6a13024bc4dfb13b..1074e6a70ac24a5d65843545a03bb842da99ab96 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.