Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1172)

Unified Diff: mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

Issue 574993002: Revert of Second attempt to land change to remove NativeViewportService and (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 abe0906e4e42a365e65d73fb7999e9de9f8ae037..30cbad68440fff0ff181cbe38fe1c339b4d362fe 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,11 +26,8 @@
gfx::InitializeThreadedX11();
#endif
-#if defined(COMPONENT_BUILD)
+ base::TestSuite::Initialize();
gfx::GLSurface::InitializeOneOffForTests();
-#endif
-
- base::TestSuite::Initialize();
// base::TestSuite and ViewsInit both try to load icu. That's ok for tests.
base::i18n::AllowMultipleInitializeCallsForTesting();

Powered by Google App Engine
This is Rietveld 408576698