Commit 49f8a92a authored by starodub@google.com's avatar starodub@google.com

Fixed sporadic ICU initialization error in content_browsertests.

BUG=

Review URL: https://codereview.chromium.org/319183002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276391 0039d316-1c4b-4281-b951-d872f2087c98
parent c1733bb1
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "base/base_paths.h" #include "base/base_paths.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/debug/stack_trace.h" #include "base/debug/stack_trace.h"
#include "base/i18n/icu_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/process/memory.h" #include "base/process/memory.h"
...@@ -51,6 +52,9 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase { ...@@ -51,6 +52,9 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {
virtual void Initialize() OVERRIDE { virtual void Initialize() OVERRIDE {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
base::i18n::AllowMultipleInitializeCallsForTesting();
base::i18n::InitializeICU();
// This needs to be done before base::TestSuite::Initialize() is called, // This needs to be done before base::TestSuite::Initialize() is called,
// as it also tries to set MessagePumpForUIFactory. // as it also tries to set MessagePumpForUIFactory.
if (!base::MessageLoop::InitMessagePumpForUIFactory( if (!base::MessageLoop::InitMessagePumpForUIFactory(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment