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

chrome/browser/autofill/phone_number.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/phone_number.h"
 
 #include "base/basictypes.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 76 matching lines @@
 
 void PhoneNumber::SetInfo(AutofillFieldType type, const string16& value) {
   if (type != PHONE_HOME_CITY_AND_NUMBER &&
       type != PHONE_HOME_WHOLE_NUMBER) {
     // Only full phone numbers should be set directly.  The remaining field
     // field types are read-only.
     return;
   }
 
   number_ = value;
-  cached_parsed_phone_ = autofill_i18n::PhoneObject(number_, locale());
+  cached_parsed_phone_ = autofill_i18n::PhoneObject(number_, GetLocale());
 }
 
 // Normalize phones if |type| is a whole number:
 //   (650)2345678 -> 6502345678
 //   1-800-FLOWERS -> 18003569377
 // If the phone cannot be normalized, returns the stored value verbatim.
 string16 PhoneNumber::GetCanonicalizedInfo(AutofillFieldType type) const {
   string16 phone = GetInfo(type);
   if (type != PHONE_HOME_WHOLE_NUMBER)
     return phone;
 
   string16 normalized_phone = autofill_i18n::NormalizePhoneNumber(phone,
-                                                                  locale());
+                                                                  GetLocale());
   if (!normalized_phone.empty())
     return normalized_phone;
 
   return phone;
 }
 
 bool PhoneNumber::SetCanonicalizedInfo(AutofillFieldType type,
                                        const string16& value) {
   string16 number = value;
   StripPunctuation(&number);
   SetInfo(type, number);
 
   return NormalizePhone();
 }
 
 void PhoneNumber::GetMatchingTypes(const string16& text,
                                    FieldTypeSet* matching_types) const {
   string16 stripped_text = text;
   StripPunctuation(&stripped_text);
   FormGroup::GetMatchingTypes(stripped_text, matching_types);
 
   // For US numbers, also compare to the three-digit prefix and the four-digit
   // suffix, since web sites often split numbers into these two fields.
   string16 number = GetCanonicalizedInfo(PHONE_HOME_NUMBER);
-  if (locale() == "US" && number.size() == (kPrefixLength + kSuffixLength)) {
+  if (GetLocale() == "US" && number.size() == (kPrefixLength + kSuffixLength)) {
     string16 prefix = number.substr(kPrefixOffset, kPrefixLength);
     string16 suffix = number.substr(kSuffixOffset, kSuffixLength);
     if (text == prefix || text == suffix)
       matching_types->insert(PHONE_HOME_NUMBER);
   }
 
   string16 whole_number = GetCanonicalizedInfo(PHONE_HOME_WHOLE_NUMBER);
   if (!whole_number.empty() &&
-      autofill_i18n::NormalizePhoneNumber(text, locale()) == whole_number) {
+      autofill_i18n::NormalizePhoneNumber(text, GetLocale()) == whole_number) {
     matching_types->insert(PHONE_HOME_WHOLE_NUMBER);
   }
 }
 
 bool PhoneNumber::NormalizePhone() {
   // Empty number does not need normalization.
   if (number_.empty())
     return true;
 
   UpdateCacheIfNeeded();
   number_ = cached_parsed_phone_.GetWholeNumber();
   return !number_.empty();
 }
 
-std::string PhoneNumber::locale() const {
+std::string PhoneNumber::GetLocale() const {
   if (!profile_) {
     NOTREACHED();
     return "US";
   }
 
   return profile_->CountryCode();
 }
 
 void PhoneNumber::UpdateCacheIfNeeded() const {
-  if (!number_.empty() && cached_parsed_phone_.GetLocale() != locale())
-    cached_parsed_phone_ = autofill_i18n::PhoneObject(number_, locale());
+  std::string locale = GetLocale();
+  if (!number_.empty() && cached_parsed_phone_.GetLocale() != locale)
+    cached_parsed_phone_ = autofill_i18n::PhoneObject(number_, locale);
 }
 
 PhoneNumber::PhoneCombineHelper::PhoneCombineHelper() {
 }
 
 PhoneNumber::PhoneCombineHelper::~PhoneCombineHelper() {
 }
 
 bool PhoneNumber::PhoneCombineHelper::SetInfo(AutofillFieldType field_type,
                                               const string16& value) {
@@ skipping 36 matching lines @@
       country_, city_, phone_,
       locale,
       (country_.empty() ?
           autofill_i18n::NATIONAL : autofill_i18n::INTERNATIONAL),
       value);
 }
 
 bool PhoneNumber::PhoneCombineHelper::IsEmpty() const {
   return phone_.empty() && whole_number_.empty();
 }