| Index: base/test/test_suite.cc
|
| diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
|
| index 82510a20c6b282f9df2ccd804bf1d7a0b4018f38..74bd9ddf7bd5bd238fb4997630c7dc5bdf51370b 100644
|
| --- a/base/test/test_suite.cc
|
| +++ b/base/test/test_suite.cc
|
| @@ -331,7 +331,10 @@ void TestSuite::Initialize() {
|
| logging::SetLogAssertHandler(UnitTestAssertHandler);
|
| }
|
|
|
| - i18n::InitializeICU();
|
| + if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kTestDoNotInitializeIcu)) {
|
| + i18n::InitializeICU();
|
| + }
|
| // On the Mac OS X command line, the default locale is *_POSIX. In Chromium,
|
| // the locale is set via an OS X locale API and is never *_POSIX.
|
| // Some tests (such as those involving word break iterator) will behave
|
|
|