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

chrome/browser/ui/webui/options/autofill_options_handler.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 "chrome/browser/ui/webui/options/autofill_options_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 425 matching lines @@
   address.SetString("guid", profile->guid());
   scoped_ptr<ListValue> list;
   GetNameList(*profile, &list);
   address.Set("fullName", list.release());
   address.SetString("companyName", profile->GetRawInfo(COMPANY_NAME));
   address.SetString("addrLine1", profile->GetRawInfo(ADDRESS_HOME_LINE1));
   address.SetString("addrLine2", profile->GetRawInfo(ADDRESS_HOME_LINE2));
   address.SetString("city", profile->GetRawInfo(ADDRESS_HOME_CITY));
   address.SetString("state", profile->GetRawInfo(ADDRESS_HOME_STATE));
   address.SetString("postalCode", profile->GetRawInfo(ADDRESS_HOME_ZIP));
-  address.SetString("country", profile->CountryCode());
+  address.SetString("country", profile->GetRawInfo(ADDRESS_HOME_COUNTRY));
   GetValueList(*profile, PHONE_HOME_WHOLE_NUMBER, &list);
   address.Set("phone", list.release());
   GetValueList(*profile, EMAIL_ADDRESS, &list);
   address.Set("email", list.release());
 
   web_ui()->CallJavascriptFunction("AutofillOptions.editAddress", address);
 }
 
 void AutofillOptionsHandler::LoadCreditCardEditor(const ListValue* args) {
   DCHECK(IsPersonalDataLoaded());
@@ skipping 60 matching lines @@
   if (args->GetString(5, &value))
     profile.SetRawInfo(ADDRESS_HOME_CITY, value);
 
   if (args->GetString(6, &value))
     profile.SetRawInfo(ADDRESS_HOME_STATE, value);
 
   if (args->GetString(7, &value))
     profile.SetRawInfo(ADDRESS_HOME_ZIP, value);
 
   if (args->GetString(8, &country_code))
-    profile.SetCountryCode(country_code);
+    profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16(country_code));
 
   if (args->GetList(9, &list_value))
     SetValueList(list_value, PHONE_HOME_WHOLE_NUMBER, &profile);
 
   if (args->GetList(10, &list_value))
     SetValueList(list_value, EMAIL_ADDRESS, &profile);
 
   if (!base::IsValidGUID(profile.guid())) {
     profile.set_guid(base::GenerateGUID());
     personal_data_->AddProfile(profile);
@@ skipping 43 matching lines @@
 
   web_ui()->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
 
 bool AutofillOptionsHandler::IsPersonalDataLoaded() const {
   return personal_data_ && personal_data_->IsDataLoaded();
 }
 
 }  // namespace options