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

chrome/browser/autofill/phone_number_i18n.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_i18n.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_country.h"
+#include "content/browser/browser_thread.h"
 #include "third_party/libphonenumber/cpp/src/phonenumberutil.h"
+#include "unicode/locid.h"
 
 using i18n::phonenumbers::PhoneNumber;
 using i18n::phonenumbers::PhoneNumberUtil;
 
 namespace {
 
 std::string SanitizeLocaleCode(const std::string& locale_code) {
   if (locale_code.length() == 2)
     return locale_code;
 
@@ skipping 199 matching lines @@
 
   // Parse phone numbers based on the locale
   PhoneNumber i18n_number1;
   if (phone_util->Parse(UTF16ToUTF8(number_a), locale.c_str(), &i18n_number1) !=
           i18n::phonenumbers::PhoneNumberUtil::NO_PARSING_ERROR) {
     return false;
   }
 
   PhoneNumber i18n_number2;
   if (phone_util->Parse(UTF16ToUTF8(number_b), locale.c_str(), &i18n_number2) !=
-      i18n::phonenumbers::PhoneNumberUtil::NO_PARSING_ERROR) {
+          i18n::phonenumbers::PhoneNumberUtil::NO_PARSING_ERROR) {

[dhollowa, 2011/10/20 15:34:27]

nit: indent seems off here.  The 'i' should line up with the 'p'.

     return false;
   }
 
   switch (phone_util->IsNumberMatch(i18n_number1, i18n_number2)) {
     case i18n::phonenumbers::PhoneNumberUtil::INVALID_NUMBER:
     case i18n::phonenumbers::PhoneNumberUtil::NO_MATCH:
       return false;
     case i18n::phonenumbers::PhoneNumberUtil::SHORT_NSN_MATCH:
       return false;
     case i18n::phonenumbers::PhoneNumberUtil::NSN_MATCH:
     case i18n::phonenumbers::PhoneNumberUtil::EXACT_MATCH:
       return true;
     default:
       NOTREACHED();
   }
 
   return false;
 }
 
 PhoneObject::PhoneObject(const string16& number, const std::string& locale)
-    : locale_(SanitizeLocaleCode(locale)),
+    : locale_(locale),
       i18n_number_(NULL) {
+  if (locale_.empty()) {
+    // TODO(isherman): Autofill profiles should always have a locale set, but in
+    // some cases it should be marked as implicit.  Otherwise, phone numbers
+    // might behave differently when they are synced across computers:
+    // http://crbug.com/100845
+
+    // For now, to avoid a data race on shutdown, make sure that we always
+    // provide a non-empty locale: http://crbug.com/100745
+    if (BrowserThread::CurrentlyOn(BrowserThread::UI))
+      locale_ = AutofillCountry::ApplicationLocale();
+    else
+      locale_ = icu::Locale::getDefault().getCountry();
+
+    if (locale_.empty())
+      locale_ = "US";
+  }
+  locale_ = SanitizeLocaleCode(locale_);
+
   scoped_ptr<PhoneNumber> i18n_number(new PhoneNumber);
   if (ParsePhoneNumberInternal(number, locale_, &country_code_, &city_code_,
                                &number_, i18n_number.get())) {
     // Phone successfully parsed - set |i18n_number_| object, |whole_number_|
     // will be set on the first call to GetWholeNumber().
     i18n_number_.reset(i18n_number.release());
   } else {
     // Parsing failed. Store passed phone "as is" into |whole_number_|.
     whole_number_ = number;
   }
@@ skipping 33 matching lines @@
   number_ = other.number_;
   locale_ = other.locale_;
   if (other.i18n_number_.get())
     i18n_number_.reset(new PhoneNumber(*other.i18n_number_));
 
   return *this;
 }
 
 }  // namespace autofill_i18n