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

components/autofill/browser/autocheckout_manager.cc

 // Copyright (c) 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 "components/autofill/browser/autocheckout_manager.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "components/autofill/browser/autocheckout_request_manager.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_field.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/field_types.h"
 #include "components/autofill/browser/form_structure.h"
 #include "components/autofill/common/autofill_messages.h"
 #include "components/autofill/common/form_data.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/autofill/common/web_element_descriptor.h"
+// TODO(jam) remove once https://codereview.chromium.org/13488009/ lands, since
+// that brings localle to AutofillManager.
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 
 using content::RenderViewHost;
 using content::SSLStatus;
 using content::WebContents;
 
@@ skipping 247 matching lines @@
 
   for (size_t i = 0; i < result->field_count(); ++i) {
     AutofillFieldType type = result->field(i)->type();
     if (type == CREDIT_CARD_VERIFICATION_CODE) {
       cvv_ = result->field(i)->value;
       continue;
     }
     if (AutofillType(type).group() == AutofillType::CREDIT_CARD) {
       credit_card_->SetRawInfo(result->field(i)->type(),
                                result->field(i)->value);
+    } else if (result->field(i)->type() == ADDRESS_HOME_COUNTRY ||
+               result->field(i)->type() == ADDRESS_BILLING_COUNTRY) {
+      profile_->SetInfo(result->field(i)->type(),
+                        result->field(i)->value,
+                        // TODO(jam) remove once
+                        // https://codereview.chromium.org/13488009/
+                        // lands, since that brings localle to AutofillManager.
+                        content::GetContentClient()->browser()->
+                            GetApplicationLocale());
     } else {
       profile_->SetRawInfo(result->field(i)->type(), result->field(i)->value);
     }
   }
 
   // Add 1.0 since page numbers are 0-indexed.
   autofill_manager_->delegate()->UpdateProgressBar(
       (1.0 + page_meta_data_->current_page_number) /
           page_meta_data_->total_pages);
   FillForms();
@@ skipping 67 matching lines @@
       google_transaction_id_);
 
   // Log the result of this Autocheckout flow to UMA.
   metric_logger_->LogAutocheckoutBuyFlowMetric(
       AutocheckoutStatusToUmaMetric(status));
 
   google_transaction_id_ = kTransactionIdNotSet;
 }
 
 }  // namespace autofill