Make autofill's Address store country using the country code so that app locale isn't needed for th…

components/autofill/browser/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 "components/autofill/browser/phone_number.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 void StripPunctuation(string16* number) {
   RemoveChars(*number, kPhoneNumberSeparators, number);
 }
 
 // Returns the region code for this phone number, which is an ISO 3166 2-letter
 // country code.  The returned value is based on the |profile|; if the |profile|
 // does not have a country code associated with it, falls back to the country
 // code corresponding to the |app_locale|.
 std::string GetRegion(const AutofillProfile& profile,
                       const std::string& app_locale) {
-  std::string country_code = profile.CountryCode();
+  string16 country_code = profile.GetRawInfo(ADDRESS_HOME_COUNTRY);
   if (!country_code.empty())
-    return country_code;
+    return WideToASCII(country_code);

[Ilya Sherman, 2013/04/05 05:18:01]

I think you want UTF16ToASCII here.

[jam, 2013/04/05 06:45:54]

yeah that was a mistake, fixed already

 
   return AutofillCountry::CountryCodeForLocale(app_locale);
 }
 
 }  // namespace
 
 PhoneNumber::PhoneNumber(AutofillProfile* profile)
     : profile_(profile) {
 }
 
@@ skipping 179 matching lines @@
     return true;
   }
 
   return autofill_i18n::ConstructPhoneNumber(
       country_, city_, phone_, GetRegion(profile, app_locale), value);
 }
 
 bool PhoneNumber::PhoneCombineHelper::IsEmpty() const {
   return phone_.empty() && whole_number_.empty();
 }