ash/test/ash_test_base.cc - Issue 12217120: Add IsInternal property to gfx::Display

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: ash/test/ash_test_base.cc

Issue 12217120: Add IsInternal property to gfx::Display (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Get rid of static initializer Created 7 years, 10 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: ash/test/ash_test_base.cc

diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc

index 4cfdac726e09047866495589f9d89c02e4e67fbf..0116710690c5ae948386dd52f7e67953a3308077 100644

--- a/ash/test/ash_test_base.cc

+++ b/ash/test/ash_test_base.cc

@@ -137,6 +137,9 @@ void AshTestBase::TearDown() {

metro_viewer_host_.reset();

#endif

event_generator_.reset();

+ // Some tests set an internal display id,

+ // reset it here, so other tests will continue in a clean environment.

+ gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);

}

aura::test::EventGenerator& AshTestBase::GetEventGenerator() {