mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc - Issue 568883003: Second attempt to land change to remove NativeViewportService and

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: mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

Issue 568883003: Second attempt to land change to remove NativeViewportService and (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Windows component build Created 6 years, 3 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

« mojo/mojo.gyp ('K') | « mojo/services/public/cpp/view_manager/lib/BUILD.gn ('k') | mojo/services/public/interfaces/native_viewport/native_viewport.mojom » ('j') | mojo/shell/desktop/mojo_main.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

index 30cbad68440fff0ff181cbe38fe1c339b4d362fe..abe0906e4e42a365e65d73fb7999e9de9f8ae037 100644

--- a/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

@@ -26,8 +26,11 @@ void ViewManagerTestSuite::Initialize() {

gfx::InitializeThreadedX11();

#endif

- base::TestSuite::Initialize();

+#if defined(COMPONENT_BUILD)

gfx::GLSurface::InitializeOneOffForTests();

+#endif

+ base::TestSuite::Initialize();

// base::TestSuite and ViewsInit both try to load icu. That's ok for tests.

base::i18n::AllowMultipleInitializeCallsForTesting();