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

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

Issue 516523004: Fixes to get view_manager_lib_unittests not crash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 | « mojo/examples/window_manager/window_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 818b04d6b0c56d53874bc305a589aa3a9062c8ca..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
@@ -4,6 +4,7 @@
#include "mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h"
+#include "base/i18n/icu_util.h"
#include "ui/gl/gl_surface.h"
#if defined(USE_X11)
@@ -27,6 +28,9 @@ void ViewManagerTestSuite::Initialize() {
base::TestSuite::Initialize();
gfx::GLSurface::InitializeOneOffForTests();
+
+ // base::TestSuite and ViewsInit both try to load icu. That's ok for tests.
+ base::i18n::AllowMultipleInitializeCallsForTesting();
}
} // namespace mojo
« no previous file with comments | « mojo/examples/window_manager/window_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698