[Android] Simplify logic for grabbing initial country-code.

components/search_engines/template_url_prepopulate_data.cc

 // Copyright 2014 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 "components/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 11 matching lines @@
 #include "components/search_engines/template_url.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #undef IN  // On Windows, windef.h defines this, which screws up "India" cases.
 #elif defined(OS_MACOSX)
 #include "base/mac/scoped_cftyperef.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "ui/base/l10n/l10n_util_android.h"
+#endif
+
 namespace TemplateURLPrepopulateData {
 
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
 // NOTE: You should probably not change the data in this file without changing
 // |kCurrentDataVersion| in prepopulated_engines.json. See comments in
 // GetDataVersion() below!
@@ skipping 572 matching lines @@
   UniChar isobuf[2];
   CFRange char_range = CFRangeMake(0, 2);
   CFStringGetCharacters(country, char_range, isobuf);
 
   return CountryCharsToCountryIDWithUpdate(static_cast<char>(isobuf[0]),
                                            static_cast<char>(isobuf[1]));
 }
 
 #elif defined(OS_ANDROID)
 
-// Initialized by InitCountryCode().
-int g_country_code_at_install = kCountryIDUnknown;
-
 int GetCurrentCountryID() {
-  return g_country_code_at_install;
+  const std::string& country_code = l10n_util::GetDefaultCountryCode();

[newt (away), 2014/10/06 18:36:48]

Is it worth caching this value?

[Peter Kasting, 2014/10/06 20:28:27]

No.  This is called at most once per run, I believe.

[Yaron, 2014/10/08 00:08:54]

Agreed. Nobody else is caching these calls either and it'ss a short-hop to Java
and reading an in-memory variable.

+  if (country_code.size() != 2) {
+    DLOG(ERROR) << "Invalid country code: " << country_code;

[Peter Kasting, 2014/10/06 20:28:27]

Unless you have a concrete plan to retrieve and act on these logs, don't log
this.

In fact, if this is a DCHECK-level failure -- i.e. it should never actually fail
-- don't handle it either.  Simply assume it succeeds, with a DCHECK to that
effect if necessary.

[Yaron, 2014/10/08 00:08:54]

it's not new (moved from below) but removed

[Peter Kasting, 2014/10/08 00:23:08]

So is it actually possible for this to return anything other than 2?

If so, you should avoid the else after return here (violates Chromium style);
one way to do this would be

  return (country_code.size() == 2) ?
      CountryCharsToCountryIDWithUpdate(country_code[0], country_code[1]) :
      kCountryIDUnknown;

[Yaron, 2014/10/17 18:24:00]

I think it's possible, especially in the context of custom roms.

+    return kCountryIDUnknown;
+  } else {
+    return CountryCharsToCountryIDWithUpdate(country_code[0], country_code[1]);
+  }
 }
 
 #elif defined(OS_POSIX)
 
 int GetCurrentCountryID() {
   const char* locale = setlocale(LC_MESSAGES, NULL);
 
   if (!locale)
     return kCountryIDUnknown;
 
@@ skipping 540 matching lines @@
       net::registry_controlled_domains::SameDomainOrHost(
           given_url, prepopulated_url,
           net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
 }
 
 }  // namespace
 
 
 // Global functions -----------------------------------------------------------
 
-#if defined(OS_ANDROID)
-void InitCountryCode(const std::string& country_code) {
-  if (country_code.size() != 2) {
-    DLOG(ERROR) << "Invalid country code: " << country_code;
-    g_country_code_at_install = kCountryIDUnknown;
-  } else {
-    g_country_code_at_install =
-        CountryCharsToCountryIDWithUpdate(country_code[0], country_code[1]);
-  }
-}
-#endif
-
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       prefs::kCountryIDAtInstall,
       kCountryIDUnknown,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterListPref(prefs::kSearchProviderOverrides,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kSearchProviderOverridesVersion,
       -1,
@@ skipping 82 matching lines @@
     for (size_t j = 0; j < kAllEngines[i]->alternate_urls_size; ++j) {
       if (SameDomain(url, GURL(kAllEngines[i]->alternate_urls[j])))
         return kAllEngines[i]->type;
     }
   }
 
   return SEARCH_ENGINE_OTHER;
 }
 
 }  // namespace TemplateURLPrepopulateData