Revert 142048 - Move thread checking from autofill_country.cc to browser_process_impl.cc

chrome/browser/autofill/autofill_country.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 "chrome/browser/autofill/autofill_country.h"
 
 #include <map>
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
@@ skipping 404 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(CountryNames);
 };
 
 // static
 CountryNames* CountryNames::GetInstance() {
   return Singleton<CountryNames>::get();
 }
 
 const std::string CountryNames::ApplicationLocale() {
-  if (application_locale_.empty())
+  if (application_locale_.empty()) {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     application_locale_ = g_browser_process->GetApplicationLocale();
+  }
 
   return application_locale_;
 }
 
 CountryNames::CountryNames() {
   // Add 2- and 3-letter ISO country codes.
   for (CountryDataMap::Iterator it = CountryDataMap::Begin();
        it != CountryDataMap::End();
        ++it) {
     const std::string& country_code = it->first;
@@ skipping 197 matching lines @@
 
 AutofillCountry::AutofillCountry(const std::string& country_code,
                                  const string16& name,
                                  const string16& postal_code_label,
                                  const string16& state_label)
     : country_code_(country_code),
       name_(name),
       postal_code_label_(postal_code_label),
       state_label_(state_label) {
 }