Reapply "Changes according to review comments"

ui/base/l10n/l10n_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 "ui/base/l10n/l10n_util.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <string>
 
 #include "base/command_line.h"
+#include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
+#include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "unicode/rbbi.h"
 #include "unicode/uloc.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/locale_utils.h"
+#endif
+
 #if defined(OS_LINUX)
 #include <glib.h>
 #endif
 
 #if defined(OS_WIN)
 #include "ui/base/l10n/l10n_util_win.h"
 #endif  // OS_WIN
 
 namespace {
 
@@ skipping 432 matching lines @@
   // because they're not accessible with other any API.
   // 4. Patch ICU to special-case zh-Hans/zh-Hant for us.
   // #1 and #2 wouldn't work if display_locale != current UI locale although
   // we can think of additional hack to work around the problem.
   // #3 can be potentially expensive.
   if (locale_code == "zh-CN")
     locale_code = "zh-Hans";
   else if (locale_code == "zh-TW")
     locale_code = "zh-Hant";
 
-  UErrorCode error = U_ZERO_ERROR;
-  const int kBufferSize = 1024;
+  string16 display_name;
+#if defined(OS_ANDROID)
+  // Use Java API to get locale display name so that we can remove most of
+  // the lang data from icu data to reduce binary size, except for zh-Hans and
+  // zh-Hant because the current Android Java API doesn't support scripts.
+  // TODO(wangxianzhu): remove the special handling of zh-Hans and zh-Hant once
+  // Android Java API supports scripts.
+  if (!StartsWithASCII(locale_code, "zh-Han", true)) {
+    display_name = base::android::GetDisplayNameForLocale(locale_code,
+                                                          display_locale);
+  } else
+#endif
+  {
+    UErrorCode error = U_ZERO_ERROR;
+    const int kBufferSize = 1024;
 
-  string16 display_name;
-  int actual_size = uloc_getDisplayName(locale_code.c_str(),
-      display_locale.c_str(),
-      WriteInto(&display_name, kBufferSize), kBufferSize - 1, &error);
-  DCHECK(U_SUCCESS(error));
-  display_name.resize(actual_size);
+    int actual_size = uloc_getDisplayName(
+        locale_code.c_str(), display_locale.c_str(),
+        WriteInto(&display_name, kBufferSize), kBufferSize - 1, &error);
+    DCHECK(U_SUCCESS(error));
+    display_name.resize(actual_size);
+  }
+
   // Add an RTL mark so parentheses are properly placed.
   if (is_for_ui && base::i18n::IsRTL())
     display_name.push_back(static_cast<char16>(base::i18n::kRightToLeftMark));
   return display_name;
 }
 
+string16 GetDisplayNameForCountry(const std::string& country_code,
+                                  const std::string& display_locale) {
+  return GetDisplayNameForLocale("_" + country_code, display_locale, false);
+}
+
 std::string NormalizeLocale(const std::string& locale) {
   std::string normalized_locale(locale);
   std::replace(normalized_locale.begin(), normalized_locale.end(), '-', '_');
 
   return normalized_locale;
 }
 
 void GetParentLocales(const std::string& current_locale,
                       std::vector<std::string>* parent_locales) {
   std::string locale(NormalizeLocale(current_locale));
@@ skipping 313 matching lines @@
   for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) {
     if (!IsLocaleNameTranslated(kAcceptLanguageList[i], display_locale))
       // TODO(jungshik) : Put them at the of the list with language codes
       // enclosed by brackets instead of skipping.
         continue;
     locale_codes->push_back(kAcceptLanguageList[i]);
   }
 }
 
 }  // namespace l10n_util