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

Unified Diff: content/test/content_test_launcher.cc

Issue 311943002: Same shutdown process for content_browsertests on android/non android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another merge attempt. Created 6 years, 6 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 | « content/public/test/browser_test_base.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/content_test_launcher.cc
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 64e91f8d28b61cdd46dbc24e2bd17563c731983f..ddb0342b12f0c68d85ab6f7422f0a761b2445b2f 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -7,6 +7,7 @@
#include "base/base_paths.h"
#include "base/command_line.h"
#include "base/debug/stack_trace.h"
+#include "base/i18n/icu_util.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "base/process/memory.h"
@@ -51,6 +52,9 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {
virtual void Initialize() OVERRIDE {
#if defined(OS_ANDROID)
+ base::i18n::AllowMultipleInitializeCallsForTesting();
+ base::i18n::InitializeICU();
+
// This needs to be done before base::TestSuite::Initialize() is called,
// as it also tries to set MessagePumpForUIFactory.
if (!base::MessageLoop::InitMessagePumpForUIFactory(
« no previous file with comments | « content/public/test/browser_test_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698