Store the language code for the address in autofill profile.

components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc

Index: components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc
diff --git a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc
index 5baf5566b77c4b6ba794d4d7632f8b526076fdbf..cb57298b52b006fb03d7160e60a266e9d783e600 100644
--- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc
+++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.cc
@@ -374,6 +374,15 @@ bool AutofillProfileSyncableService::OverwriteProfileWithServerData(
     diff = UpdateField(ADDRESS_HOME_LINE2,
                        specifics.address_home_line2(), profile) || diff;
   }
+
+  // Update the BCP 47 language code that can be used to format the address for
+  // display.
+  if (specifics.has_address_home_language_code() &&

[Ilya Sherman, 2014/04/02 23:48:11]

Hmm, I wonder whether we should similarly test specifics.has_origin() on line
319.  Could you please write a testcase for this, and possibly fix up that code,
if need be?

[please use gerrit instead, 2014/04/08 21:33:31]

Done.

+      specifics.address_home_language_code() != profile->language_code()) {
+    profile->set_language_code(specifics.address_home_language_code());
+    diff = true;
+  }
+
   return diff;
 }
 
@@ -431,6 +440,7 @@ void AutofillProfileSyncableService::WriteAutofillProfile(
   specifics->set_address_home_dependent_locality(
       LimitData(
           UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY))));
+  specifics->set_address_home_language_code(LimitData(profile.language_code()));
 
   profile.GetRawMultiInfo(EMAIL_ADDRESS, &values);
   for (size_t i = 0; i < values.size(); ++i) {