| Index: services/shell/public/cpp/lib/initialize_base_and_icu.cc
|
| diff --git a/services/shell/public/cpp/lib/initialize_base_and_icu.cc b/services/shell/public/cpp/lib/initialize_base_and_icu.cc
|
| index 4277f4f46f9663cd056d85e0b8937dc02373c2ae..b910f0feea01e68cdf17d0f76fb748dbe97b6bf9 100644
|
| --- a/services/shell/public/cpp/lib/initialize_base_and_icu.cc
|
| +++ b/services/shell/public/cpp/lib/initialize_base_and_icu.cc
|
| @@ -35,11 +35,13 @@ InitializeBase(const uint8_t* icu_data) {
|
| base::SysInfo::MaxSharedMemorySize();
|
| #endif
|
|
|
| +#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
|
| // Initialize core ICU. We must perform the full initialization before we
|
| // initialize icu::TimeZone subsystem because otherwise ICU gets in a state
|
| // where the timezone data is disconnected from the locale data which can
|
| // cause crashes.
|
| CHECK(base::i18n::InitializeICUFromRawMemory(icu_data));
|
| +#endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
|
|
|
| #if !defined(OS_ANDROID)
|
| // ICU DateFormat class (used in base/time_format.cc) needs to get the
|
|
|