chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc - Issue 419523003: Relands "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/ui/webui/options/chromeos/shared_options_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

« chrome/browser/sessions/session_restore_browsertest_chromeos.cc ('K') | « chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc ('k') | chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

index dc2c9ffdd13776b4875d8a116a37875710cbebb2..a8255db0c2d97759c741767ff2d9d8417552fc4e 100644

--- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

+++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

@@ -103,10 +103,10 @@ class SharedOptionsTest : public LoginManagerTest {

settings->AddSettingsProvider(device_settings_provider_);

}

- virtual void CleanUpOnMainThread() OVERRIDE {

+ virtual void TearDownOnMainThread() OVERRIDE {

CrosSettings* settings = CrosSettings::Get();

settings->RemoveSettingsProvider(&stub_settings_provider_);

- LoginManagerTest::CleanUpOnMainThread();

+ LoginManagerTest::TearDownOnMainThread();

}

protected: