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

ui/base/l10n/l10n_util_android.h

Index: ui/base/l10n/l10n_util_android.h
diff --git a/ui/base/l10n/l10n_util_android.h b/ui/base/l10n/l10n_util_android.h
index c8cf4bb2733848aa340b8679d00d52f8f2135904..c3edd0b4b97b75e26adf3d745eca3e475e750b61 100644
--- a/ui/base/l10n/l10n_util_android.h
+++ b/ui/base/l10n/l10n_util_android.h
@@ -17,6 +17,8 @@ namespace l10n_util {
 // Return the current default locale of the device.
 UI_BASE_EXPORT std::string GetDefaultLocale();

[sky, 2014/10/08 03:08:03]

I'm surprised the local and country code are ui related. Any idea why this code
is here?

[Yaron, 2014/10/09 18:09:19]

Nope. Is base/i18n a better place?

[jungshik at Google, 2014/10/13 21:46:17]

I like that better, too. A lot of stuffs in l10n_util had better be in
base/i18n. 

JFYI:
You don't have to change (given that CountryCode is used elsewhere in the code
you're touching), RegionCode would be slightly 'safer'. 

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

I ended up just moving to regular base as theres' an existing LocaleUtils there.
I also moved GetDefaultLocale there since this was just redirecting there.

 
+UI_BASE_EXPORT std::string GetDefaultCountryCode();
+
 UI_BASE_EXPORT base::string16 GetDisplayNameForLocale(
     const std::string& locale,
     const std::string& display_locale);