Fix icu_use_data_file = false.

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
 
@@ skipping 18 matching lines @@
 #endif
 
 #if defined(OS_IOS)
 #include "base/ios/ios_util.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #endif
 
-#define ICU_UTIL_DATA_FILE   0
-#define ICU_UTIL_DATA_SHARED 1
-#define ICU_UTIL_DATA_STATIC 2
-
 namespace base {
 namespace i18n {
 
 #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED
 #define ICU_UTIL_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat"
 #if defined(OS_WIN)
 #define ICU_UTIL_DATA_SHARED_MODULE_NAME "icudt.dll"
 #endif
 #endif
 
 namespace {
 #if !defined(OS_NACL)
 #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.
 bool g_check_called_once = true;
 bool g_called_once = false;
 #endif  // !defined(NDEBUG)
 
+#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
+
 // To debug http://crbug.com/445616.
 int g_debug_icu_last_error;
 int g_debug_icu_load;
 int g_debug_icu_pf_error_details;
 int g_debug_icu_pf_last_error;
 #if defined(OS_WIN)
 wchar_t g_debug_icu_pf_filename[_MAX_PATH];
 #endif  // OS_WIN
-
-#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
 // Use an unversioned file name to simplify a icu version update down the road.
 // No need to change the filename in multiple places (gyp files, windows
 // build pkg configurations, etc). 'l' stands for Little Endian.
 // This variable is exported through the header file.
 const char kIcuDataFileName[] = "icudtl.dat";
 #if defined(OS_ANDROID)
 const char kAndroidAssetsIcuDataFileName[] = "assets/icudtl.dat";
 #endif
 
 // File handle intentionally never closed. Not using File here because its
@@ skipping 234 matching lines @@
 #endif  // !defined(OS_NACL)
 
 void AllowMultipleInitializeCallsForTesting() {
 #if !defined(NDEBUG) && !defined(OS_NACL)
   g_check_called_once = false;
 #endif
 }
 
 }  // namespace i18n
 }  // namespace base