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

base/android/base_jni_registrar.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 "base/android/base_jni_registrar.h"
 
 #include "base/android/application_status_listener.h"
 #include "base/android/build_info.h"
 #include "base/android/command_line_android.h"
 #include "base/android/content_uri_utils.h"
 #include "base/android/cpu_features.h"
 #include "base/android/event_log.h"
 #include "base/android/field_trial_list.h"
 #include "base/android/important_file_writer_android.h"
 #include "base/android/java_handler_thread.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/jni_utils.h"
+#include "base/android/locale_utils.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/android/path_service_android.h"
 #include "base/android/path_utils.h"
 #include "base/android/sys_utils.h"
 #include "base/android/thread_utils.h"
 #include "base/android/trace_event_binding.h"
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_pump_android.h"
 #include "base/power_monitor/power_monitor_device_source_android.h"
 
 namespace base {
 namespace android {
 
 static RegistrationMethod kBaseRegisteredMethods[] = {
   { "ApplicationStatusListener",
       base::android::ApplicationStatusListener::RegisterBindings },
   { "BuildInfo", base::android::BuildInfo::RegisterBindings },
   { "CommandLine", base::android::RegisterCommandLine },
   { "ContentUriUtils", base::RegisterContentUriUtils },
   { "CpuFeatures", base::android::RegisterCpuFeatures },
   { "EventLog", base::android::RegisterEventLog },
   { "FieldTrialList", base::android::RegisterFieldTrialList },
   { "ImportantFileWriterAndroid",
     base::android::RegisterImportantFileWriterAndroid },
   { "JNIUtils", base::android::RegisterJNIUtils },
+  { "LocaleUtils", base::android::RegisterLocaleUtils },
   { "MemoryPressureListenerAndroid",
       base::android::MemoryPressureListenerAndroid::Register },
   { "JavaHandlerThread", base::android::JavaHandlerThread::RegisterBindings },
   { "PathService", base::android::RegisterPathService },
   { "PathUtils", base::android::RegisterPathUtils },
   { "SystemMessageHandler", base::MessagePumpForUI::RegisterBindings },
   { "SysUtils", base::android::SysUtils::Register },
   { "PowerMonitor", base::RegisterPowerMonitor },
   { "ThreadUtils", base::RegisterThreadUtils },
   { "TraceEvent", base::android::RegisterTraceEvent },
 };
 
 bool RegisterJni(JNIEnv* env) {
   TRACE_EVENT0("startup", "base_android::RegisterJni");
   return RegisterNativeMethods(env, kBaseRegisteredMethods,
                                arraysize(kBaseRegisteredMethods));
 }
 
 }  // namespace android
 }  // namespace base