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

Index: components/autofill/browser/autocheckout_manager.cc
===================================================================
--- components/autofill/browser/autocheckout_manager.cc	(revision 192389)
+++ components/autofill/browser/autocheckout_manager.cc	(working copy)
@@ -20,6 +20,9 @@
 #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"
@@ -287,6 +290,15 @@
     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);
     }