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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // Copyright 2013 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/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 135 matching lines @@
     (*inputs)[j].initial_value =
         group->GetInfo((*inputs)[j].type, app_locale);
   }
 }
 
 // Initializes |form_group| from user-entered data.
 void FillFormGroupFromOutputs(const DetailOutputMap& detail_outputs,
                               FormGroup* form_group) {
   for (DetailOutputMap::const_iterator iter = detail_outputs.begin();
        iter != detail_outputs.end(); ++iter) {
-    if (!iter->second.empty())
-      form_group->SetRawInfo(iter->first->type, iter->second);
+    if (!iter->second.empty()) {
+      if (iter->first->type == ADDRESS_HOME_COUNTRY ||
+          iter->first->type == ADDRESS_BILLING_COUNTRY) {
+        form_group->SetInfo(iter->first->type,
+                            iter->second,
+                            g_browser_process->GetApplicationLocale());
+      } else {
+        form_group->SetRawInfo(iter->first->type, iter->second);
+      }
+    }
   }
 }
 
 // Get billing info from |output| and put it into |card|, |cvc|, and |profile|.
 // These outparams are required because |card|/|profile| accept different types
 // of raw info, and CreditCard doesn't save CVCs.
 void GetBillingInfoFromOutputs(const DetailOutputMap& output,
                                CreditCard* card,
                                string16* cvc,
                                AutofillProfile* profile) {
   for (DetailOutputMap::const_iterator it = output.begin();
        it != output.end(); ++it) {
     string16 trimmed;
     TrimWhitespace(it->second, TRIM_ALL, &trimmed);
 
     // Special case CVC as CreditCard just swallows it.
     if (it->first->type == CREDIT_CARD_VERIFICATION_CODE) {
       if (cvc)
         cvc->assign(trimmed);
+    } else if (it->first->type == ADDRESS_HOME_COUNTRY ||
+               it->first->type == ADDRESS_BILLING_COUNTRY) {
+        profile->SetInfo(it->first->type,
+                         trimmed,
+                         g_browser_process->GetApplicationLocale());
     } else {
       // Copy the credit card name to |profile| in addition to |card| as
       // wallet::Instrument requires a recipient name for its billing address.
       if (profile && it->first->type == CREDIT_CARD_NAME)
         profile->SetRawInfo(NAME_FULL, trimmed);
 
       if (IsCreditCardType(it->first->type)) {
         if (card)
           card->SetRawInfo(it->first->type, trimmed);
       } else if (profile) {
@@ skipping 1878 matching lines @@
         AutofillMetrics::DIALOG_USER_SIGNED_IN_NO_WALLET_NO_AUTOFILL;
   }
 
   // Has Wallet items.
   return has_autofill_profiles ?
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_HAS_AUTOFILL :
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_NO_AUTOFILL;
 }
 
 }  // namespace autofill