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

Index: components/autofill/browser/phone_number.cc
===================================================================
--- components/autofill/browser/phone_number.cc	(revision 192389)
+++ components/autofill/browser/phone_number.cc	(working copy)
@@ -34,9 +34,9 @@
 // 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 UTF16ToASCII(country_code);
 
   return AutofillCountry::CountryCodeForLocale(app_locale);
 }