[Android] Fix icu_use_data_file = false.

content/app/content_main_runner.cc

Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index be41018283c54f7889451190990c4ef6ca0f2e7e..01bb5f00f42ce6a9499708f7a53c5766054c62fc 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -471,6 +471,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
 #endif  // OS_ANDROID
 
     base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance();
+    ALLOW_UNUSED_LOCAL(g_fds);

[jungshik at Google, 2016/08/19 23:10:48]

I wonder if it'd be better to enclose |base::Glo...g_fds = ...| with 

#if !defined(OS_ANDROID) || (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)

instead of ALLOW_UNUSED_LOCAL(g_fds). 

[Eden Wang, 2016/08/20 00:41:42]

I think it would be a very long statement to enclose |base::Glo...g_fds = ...|,
because g_fds is used for

!defined(OS_ANDROID)
defined(OS_LINUX) || defined(OS_OPENBSD)
defined(OS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
defined(V8_USE_EXTERNAL_STARTUP_DATA) && defined(OS_POSIX) &&
!defined(OS_MACOSX)

and this statement is not stable, we need add more conditions after any other fd
has been accessed.

[jungshik at Google, 2016/08/22 20:02:00]

I don't think you need that long condition. The short condition I gave 
seems sufficient because g_fds is used right below for setlocale when OS !=
Android. 
Having to change the condition (when that's not the case any more) is a
downside, though. 

Anyway, it's not a big deal. I'm ok with ALLOW..LOCALE. 

 
     // On Android,
     // - setlocale() is not supported.
@@ -678,7 +679,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
     RegisterPathProvider();
     RegisterContentSchemes(true);
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
     int icudata_fd = g_fds->MaybeGet(kAndroidICUDataDescriptor);
     if (icudata_fd != -1) {
       auto icudata_region = g_fds->GetRegion(kAndroidICUDataDescriptor);
@@ -689,7 +690,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
     }
 #else
     CHECK(base::i18n::InitializeICU());
-#endif  // OS_ANDROID
+#endif  // OS_ANDROID && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
 
     base::StatisticsRecorder::Initialize();