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

components/autofill/browser/android/personal_data_manager_android.cc

Index: components/autofill/browser/android/personal_data_manager_android.cc
===================================================================
--- components/autofill/browser/android/personal_data_manager_android.cc	(revision 192389)
+++ components/autofill/browser/android/personal_data_manager_android.cc	(working copy)
@@ -8,6 +8,10 @@
 #include "components/autofill/browser/android/auxiliary_profiles_android.h"
 #include "components/autofill/browser/personal_data_manager.h"
 
+// TODO(jam) remove once https://codereview.chromium.org/13488009/ lands, since
+// that brings localle to PDM.
+#include "content/public/browser/content_browser_client.h"
+
 void PersonalDataManager::LoadAuxiliaryProfiles() {
   auxiliary_profiles_.clear();
   autofill::AuxiliaryProfileLoaderAndroid profile_loader;
@@ -15,7 +19,11 @@
       base::android::AttachCurrentThread(),
       base::android::GetApplicationContext());
   if (profile_loader.GetHasPermissions()) {
-    autofill::AuxiliaryProfilesAndroid impl(profile_loader);
+    autofill::AuxiliaryProfilesAndroid impl(
+        profile_loader,
+        // TODO(jam) remove once https://codereview.chromium.org/13488009/
+        // lands, since that brings localle to PDM.
+        content::GetContentClient()->browser()->GetApplicationLocale());
     auxiliary_profiles_.push_back(impl.LoadContactsProfile().release());
   }
 }