chrome/browser/chromeos/login/screens/update_screen_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/screens/update_screen_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:

Index: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

index 16d1c43117e4e433b78c4f6a68e6372fbee58632..1fcc9f64e19bab0d3bfbf6d5b77adca44ce68cd0 100644

--- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

+++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

@@ -91,10 +91,10 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {

update_screen_->screen_observer_ = mock_screen_observer_.get();

}

- virtual void CleanUpOnMainThread() OVERRIDE {

+ virtual void TearDownOnMainThread() OVERRIDE {

mock_error_screen_.reset();

mock_error_screen_actor_.reset();

- WizardInProcessBrowserTest::CleanUpOnMainThread();

+ WizardInProcessBrowserTest::TearDownOnMainThread();

}

virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {