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

components/autofill/browser/wallet/wallet_address.cc

 // Copyright (c) 2012 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/wallet/wallet_address.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/browser/autofill_country.h"
@@ skipping 64 matching lines @@
                      postal_code_number,
                      phone_number,
                      object_id);
 }
 
 }  // namespace
 
 Address::Address() {}
 
 Address::Address(const AutofillProfile& profile)
-    : country_name_code_(profile.CountryCode()),
+    : country_name_code_(WideToASCII(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))),

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

I think you want UTF16ToASCII here... though actually, it might make more sense
to just change the type of country_name_code_ to be string16 and skip the string
conversion entirely.

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

Done
I've left that for the original authors to change if they want

       recipient_name_(profile.GetRawInfo(NAME_FULL)),
       address_line_1_(profile.GetRawInfo(ADDRESS_HOME_LINE1)),
       address_line_2_(profile.GetRawInfo(ADDRESS_HOME_LINE2)),
       locality_name_(profile.GetRawInfo(ADDRESS_HOME_CITY)),
       administrative_area_name_(profile.GetRawInfo(ADDRESS_HOME_STATE)),
       postal_code_number_(profile.GetRawInfo(ADDRESS_HOME_ZIP)),
       phone_number_(profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)) {}
 
 Address::Address(const std::string& country_name_code,
                  const string16& recipient_name,
@@ skipping 183 matching lines @@
          phone_number_ == other.phone_number_ &&
          object_id_ == other.object_id_;
 }
 
 bool Address::operator!=(const Address& other) const {
   return !(*this == other);
 }
 
 }  // namespace wallet
 }  // namespace autofill