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

ui/base/l10n/l10n_util_android.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_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/i18n/rtl.h"
@@ skipping 12 matching lines @@
       base::android::ConvertJavaStringToUTF16(env, string));
 }
 
 std::string GetDefaultLocale() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> locale = Java_LocalizationUtils_getDefaultLocale(
       env);
   return ConvertJavaStringToUTF8(locale);
 }
 
+std::string GetDefaultCountryCode() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  return ConvertJavaStringToUTF8(
+      Java_LocalizationUtils_getDefaultCountryCode(env));
+}
+
 bool IsLayoutRtl() {
   static bool is_layout_rtl_cached = false;
   static bool layout_rtl_cache;
 
   if (!is_layout_rtl_cached) {
     is_layout_rtl_cached = true;
     JNIEnv* env = base::android::AttachCurrentThread();
     layout_rtl_cache =
         static_cast<bool>(Java_LocalizationUtils_isLayoutRtl(env));
   }
@@ skipping 64 matching lines @@
               ui::TimeFormat::FORMAT_REMAINING, ui::TimeFormat::LENGTH_SHORT,
               base::TimeDelta::FromMilliseconds(timeInMillis)));
   return jtime_remaining.Release();
 }
 
 bool RegisterLocalizationUtil(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace l10n_util