Update from https://crrev.com/327068

base/i18n/icu_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/i18n/icu_util.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 
+#include "base/debug/alias.h"
 #include "base/files/file_path.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "third_party/icu/source/common/unicode/putil.h"
 #include "third_party/icu/source/common/unicode/udata.h"
 
 #if defined(OS_MACOSX)
@@ skipping 18 matching lines @@
 #define ICU_UTIL_DATA_SHARED_MODULE_NAME "icudt.dll"
 #endif
 #endif
 
 namespace {
 
 #if !defined(NDEBUG)
 // Assert that we are not called more than once.  Even though calling this
 // function isn't harmful (ICU can handle it), being called twice probably
 // indicates a programming error.
+#if !defined(OS_NACL)
 bool g_called_once = false;
+#endif
 bool g_check_called_once = true;
 #endif
 }
 
 #if defined(OS_ANDROID)
 bool InitializeICUWithFileDescriptor(
     int data_fd,
     base::MemoryMappedFile::Region data_region) {
 #if !defined(NDEBUG)
   DCHECK(!g_check_called_once || !g_called_once);
@@ skipping 12 matching lines @@
     }
   }
   UErrorCode err = U_ZERO_ERROR;
   udata_setCommonData(const_cast<uint8*>(mapped_file.data()), &err);
   return err == U_ZERO_ERROR;
 #endif // ICU_UTIL_DATA_FILE
 }
 #endif
 
 
+#if !defined(OS_NACL)
 bool InitializeICU() {
 #if !defined(NDEBUG)
   DCHECK(!g_check_called_once || !g_called_once);
   g_called_once = true;
 #endif
 
 #if (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED)
   // We expect to find the ICU data module alongside the current module.
   FilePath data_path;
   PathService::Get(base::DIR_MODULE, &data_path);
@@ skipping 26 matching lines @@
 
   // Chrome doesn't normally shut down ICU, so the mapped data shouldn't ever
   // be released.
   CR_DEFINE_STATIC_LOCAL(base::MemoryMappedFile, mapped_file, ());
   if (!mapped_file.IsValid()) {
 #if !defined(OS_MACOSX)
     FilePath data_path;
 #if defined(OS_WIN)
     // The data file will be in the same directory as the current module.
     bool path_ok = PathService::Get(base::DIR_MODULE, &data_path);
+    wchar_t tmp_buffer[_MAX_PATH] = {0};
+    wcscpy_s(tmp_buffer, data_path.value().c_str());
+    base::debug::Alias(tmp_buffer);
+    CHECK(path_ok);  // TODO(scottmg): http://crbug.com/445616
 #elif defined(OS_ANDROID)
     bool path_ok = PathService::Get(base::DIR_ANDROID_APP_DATA, &data_path);
 #else
     // For now, expect the data file to be alongside the executable.
     // This is sufficient while we work on unit tests, but will eventually
     // likely live in a data directory.
     bool path_ok = PathService::Get(base::DIR_EXE, &data_path);
 #endif
     DCHECK(path_ok);
     data_path = data_path.AppendASCII(kIcuDataFileName);
+
+#if defined(OS_WIN)
+    // TODO(scottmg): http://crbug.com/445616
+    wchar_t tmp_buffer2[_MAX_PATH] = {0};
+    wcscpy_s(tmp_buffer2, data_path.value().c_str());
+    base::debug::Alias(tmp_buffer2);
+#endif
+
 #else
     // Assume it is in the framework bundle's Resources directory.
     base::ScopedCFTypeRef<CFStringRef> data_file_name(
         SysUTF8ToCFStringRef(kIcuDataFileName));
     FilePath data_path =
       base::mac::PathForFrameworkBundleResource(data_file_name);
     if (data_path.empty()) {
       LOG(ERROR) << kIcuDataFileName << " not found in bundle";
       return false;
     }
 #endif  // OS check
     if (!mapped_file.Initialize(data_path)) {
+#if defined(OS_WIN)
+      CHECK(false);  // TODO(scottmg): http://crbug.com/445616
+#endif
       LOG(ERROR) << "Couldn't mmap " << data_path.AsUTF8Unsafe();
       return false;
     }
   }
   UErrorCode err = U_ZERO_ERROR;
   udata_setCommonData(const_cast<uint8*>(mapped_file.data()), &err);
+#if defined(OS_WIN)
+  CHECK(err == U_ZERO_ERROR);  // TODO(scottmg): http://crbug.com/445616
+#endif
   return err == U_ZERO_ERROR;
 #endif
 }
+#endif
 
 void AllowMultipleInitializeCallsForTesting() {
 #if !defined(NDEBUG)
   g_check_called_once = false;
 #endif
 }
 
 }  // namespace i18n
 }  // namespace base