[Autofill, Sync] Sync additional Autofill address fields for i18n.

chrome/browser/webdata/autofill_profile_syncable_service.cc

 // Copyright (c) 2012 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/webdata/autofill_profile_syncable_service.h"
 
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 326 matching lines @@
   diff = UpdateMultivaluedField(NAME_LAST,
                                 specifics.name_last(), profile) || diff;
   diff = UpdateMultivaluedField(EMAIL_ADDRESS,
                                 specifics.email_address(), profile) || diff;
   diff = UpdateMultivaluedField(PHONE_HOME_WHOLE_NUMBER,
                                 specifics.phone_home_whole_number(),
                                 profile) || diff;
 
   // Update all simple single-valued address fields.
   diff = UpdateField(COMPANY_NAME, specifics.company_name(), profile) || diff;
-  diff = UpdateField(ADDRESS_HOME_LINE1,
-                     specifics.address_home_line1(), profile) || diff;
-  diff = UpdateField(ADDRESS_HOME_LINE2,
-                     specifics.address_home_line2(), profile) || diff;
   diff = UpdateField(ADDRESS_HOME_CITY,
                      specifics.address_home_city(), profile) || diff;
   diff = UpdateField(ADDRESS_HOME_STATE,
                      specifics.address_home_state(), profile) || diff;
   diff = UpdateField(ADDRESS_HOME_ZIP,
                      specifics.address_home_zip(), profile) || diff;
+  diff = UpdateField(ADDRESS_HOME_SORTING_CODE,
+                     specifics.address_home_sorting_code(), profile) || diff;
+  diff = UpdateField(ADDRESS_HOME_DEPENDENT_LOCALITY,
+                     specifics.address_home_dependent_locality(),
+                     profile) || diff;
 
   // Update the country field, which can contain either a country code (if set
   // by a newer version of Chrome), or a country name (if set by an older
   // version of Chrome).
   base::string16 country_name_or_code =
       ASCIIToUTF16(specifics.address_home_country());
   std::string country_code =
       AutofillCountry::GetCountryCode(country_name_or_code, app_locale);
   diff = UpdateField(ADDRESS_HOME_COUNTRY, country_code, profile) || diff;
 
+  // Update the street address.  In newer versions of Chrome (M34+), this data
+  // is stored in the |address_home_street_address| field.  In older versions,
+  // this data is stored separated out by address line.
+  if (specifics.has_address_home_street_address()) {
+    diff = UpdateField(ADDRESS_HOME_STREET_ADDRESS,
+                       specifics.address_home_street_address(),
+                       profile) || diff;
+  } else {
+    diff = UpdateField(ADDRESS_HOME_LINE1,
+                       specifics.address_home_line1(), profile) || diff;
+    diff = UpdateField(ADDRESS_HOME_LINE2,
+                       specifics.address_home_line2(), profile) || diff;
+  }
   return diff;
 }
 
 // static
 void AutofillProfileSyncableService::WriteAutofillProfile(
     const AutofillProfile& profile,
     sync_pb::EntitySpecifics* profile_specifics) {
   sync_pb::AutofillProfileSpecifics* specifics =
       profile_specifics->mutable_autofill_profile();
 
@@ skipping 30 matching lines @@
   specifics->set_address_home_line2(
       LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_LINE2))));
   specifics->set_address_home_city(
       LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_CITY))));
   specifics->set_address_home_state(
       LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE))));
   specifics->set_address_home_zip(
       LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP))));
   specifics->set_address_home_country(
       LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))));
+  specifics->set_address_home_street_address(
+      LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS))));
+  specifics->set_address_home_sorting_code(
+      LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE))));
+  specifics->set_address_home_dependent_locality(
+      LimitData(
+          UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY))));
 
   profile.GetRawMultiInfo(EMAIL_ADDRESS, &values);
   for (size_t i = 0; i < values.size(); ++i) {
     specifics->add_email_address(LimitData(UTF16ToUTF8(values[i])));
   }
 
   specifics->set_company_name(
       LimitData(UTF16ToUTF8(profile.GetRawInfo(COMPANY_NAME))));
 
   profile.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
@@ skipping 193 matching lines @@
 void AutofillProfileSyncableService::InjectStartSyncFlare(
     const syncer::SyncableService::StartSyncFlare& flare) {
   flare_ = flare;
 }
 
 AutofillProfileSyncableService::DataBundle::DataBundle() {}
 
 AutofillProfileSyncableService::DataBundle::~DataBundle() {}
 
 }  // namespace autofill