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

android_webview/browser/aw_form_database_service.cc

 // Copyright (c) 2013 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 "android_webview/browser/aw_form_database_service.h"
+
+#include "base/android/locale_utils.h"
 #include "base/logging.h"
 #include "base/synchronization/waitable_event.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/webdata/common/webdata_constants.h"
 #include "content/public/browser/browser_thread.h"
-#include "ui/base/l10n/l10n_util_android.h"
 
 using base::WaitableEvent;
 using content::BrowserThread;
 
 namespace {
 
 // Callback to handle database error. It seems chrome uses this to
 // display an error dialog box only.
 void DatabaseErrorCallback(sql::InitStatus status) {
   LOG(WARNING) << "initializing autocomplete database failed";
 }
 
 }  // namespace
 
 namespace android_webview {
 
 AwFormDatabaseService::AwFormDatabaseService(const base::FilePath path) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   web_database_ = new WebDatabaseService(path.Append(kWebDataFilename),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB));
   web_database_->AddTable(
       scoped_ptr<WebDatabaseTable>(new autofill::AutofillTable(
-          l10n_util::GetDefaultLocale())));
+          base::android::GetDefaultLocale())));
   web_database_->LoadDatabase();
 
   autofill_data_ = new autofill::AutofillWebDataService(
       web_database_,
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
       base::Bind(&DatabaseErrorCallback));
   autofill_data_->Init();
 }
 
@@ skipping 72 matching lines @@
   if (it == result_map_.end()) {
     LOG(WARNING) << "Received unexpected callback from web data service";
     return;
   }
   *(it->second.result) = has_form_data;
   it->second.completion->Signal();
   result_map_.erase(h);
 }
 
 }  // namespace android_webview