chrome/browser/extensions/api/system_display/system_display_apitest.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/extensions/api/system_display/system_display_apitest.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/extensions/api/streams_private/streams_private_apitest.cc ('k') | chrome/browser/extensions/extension_test_message_listener.h » ('j') | chrome/browser/sessions/session_restore_browsertest_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/system_display/system_display_apitest.cc

diff --git a/chrome/browser/extensions/api/system_display/system_display_apitest.cc b/chrome/browser/extensions/api/system_display/system_display_apitest.cc

index 17a0dcf1182fb9254755c14fd083490d9bb191b8..e2b78f736be7b67356077609c5462fbaa16b59e2 100644

--- a/chrome/browser/extensions/api/system_display/system_display_apitest.cc

+++ b/chrome/browser/extensions/api/system_display/system_display_apitest.cc

@@ -182,12 +182,12 @@ class SystemDisplayApiTest: public ExtensionApiTest {

DisplayInfoProvider::InitializeForTesting(provider_.get());

}

- virtual void CleanUpOnMainThread() OVERRIDE {

+ virtual void TearDownOnMainThread() OVERRIDE {

#if defined(OS_CHROMEOS)

gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,

ash::Shell::GetScreen());

#endif

- ExtensionApiTest::CleanUpOnMainThread();

+ ExtensionApiTest::TearDownOnMainThread();

}

protected: