Fix an Autofill crash caused by accessing the g_browser_process on the DB thread.

chrome/browser/autofill/autofill_country.cc

 // Copyright (c) 2011 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 <stddef.h>
 #include <stdint.h>
 #include <map>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "content/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "unicode/coll.h"
 #include "unicode/locid.h"
 #include "unicode/ucol.h"
 #include "unicode/uloc.h"
 #include "unicode/unistr.h"
 #include "unicode/urename.h"
 #include "unicode/utypes.h"
 
@@ skipping 319 matching lines @@
     const std::string& country_code) {
   return GetInstance()->country_data_.find(country_code);
 }
 
 // A singleton class that encapsulates mappings from country names to their
 // corresponding country codes.
 class CountryNames {
  public:
   static CountryNames* GetInstance();
 
+  // Returns the application locale.
+  const std::string ApplicationLocale();
+
   // Returns the country code corresponding to |country|, which should be a
   // country code or country name localized to |locale|.
   const std::string GetCountryCode(const string16& country,
                                    const std::string& locale);
 
  private:
   CountryNames();
   ~CountryNames();
   friend struct DefaultSingletonTraits<CountryNames>;
 
@@ skipping 29 matching lines @@
   // The outer map keys are ICU locale identifiers.
   // The inner maps map from localized country names to their corresponding
   // country codes. The inner map keys are ICU collation sort keys corresponding
   // to the target localized country name.
   std::map<std::string, std::map<std::string, std::string> >
       locales_to_localized_names_;
 
   // Maps ICU locale names to their corresponding collators.
   std::map<std::string, icu::Collator*> collators_;
 
+  // Caches the application locale, for thread-safe access.
+  std::string application_locale_;
+
   DISALLOW_COPY_AND_ASSIGN(CountryNames);
 };
 
 // static
 CountryNames* CountryNames::GetInstance() {
   return Singleton<CountryNames>::get();
 }
 
+const std::string CountryNames::ApplicationLocale() {
+  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;
     std::string iso3_country_code =
         icu::Locale(NULL, country_code.c_str()).getISO3Country();
 
     common_names_.insert(std::make_pair(country_code, country_code));
@@ skipping 196 matching lines @@
 }
 
 // static
 const std::string AutofillCountry::GetCountryCode(const string16& country,
                                                   const std::string& locale) {
   return CountryNames::GetInstance()->GetCountryCode(country, locale);
 }
 
 // static
 const std::string AutofillCountry::ApplicationLocale() {
-  return g_browser_process->GetApplicationLocale();
+  return CountryNames::GetInstance()->ApplicationLocale();
 }
 
 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) {
 }