[Autofill] Distinguish between native field types and potentially HTML field types.

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"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/form_group.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/webdata/common/web_database.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/protocol/sync.pb.h"
 
 using autofill::AutofillCountry;
-using autofill::AutofillFieldType;
+using autofill::ServerFieldType;
 using autofill::AutofillProfile;
 using autofill::AutofillProfileChange;
 using autofill::AutofillTable;
 using autofill::AutofillWebDataService;
 using content::BrowserThread;
 
 namespace {
 
 std::string LimitData(const std::string& data) {
   std::string sanitized_value(data);
@@ skipping 525 matching lines @@
 syncer::SyncData AutofillProfileSyncableService::CreateData(
     const AutofillProfile& profile) {
   sync_pb::EntitySpecifics specifics;
   WriteAutofillProfile(profile, &specifics);
   return
       syncer::SyncData::CreateLocalData(
           profile.guid(), profile.guid(), specifics);
 }
 
 bool AutofillProfileSyncableService::UpdateField(
-    AutofillFieldType field_type,
+    ServerFieldType field_type,
     const std::string& new_value,
     AutofillProfile* autofill_profile) {
   if (UTF16ToUTF8(autofill_profile->GetRawInfo(field_type)) == new_value)
     return false;
   autofill_profile->SetRawInfo(field_type, UTF8ToUTF16(new_value));
   return true;
 }
 
 bool AutofillProfileSyncableService::UpdateMultivaluedField(
-    AutofillFieldType field_type,
+    ServerFieldType field_type,
     const ::google::protobuf::RepeatedPtrField<std::string>& new_values,
     AutofillProfile* autofill_profile) {
   std::vector<string16> values;
   autofill_profile->GetRawMultiInfo(field_type, &values);
   bool changed = false;
   if (static_cast<size_t>(new_values.size()) != values.size()) {
     values.clear();
     values.resize(static_cast<size_t>(new_values.size()));
     changed = true;
   }
@@ skipping 24 matching lines @@
 }
 
 void AutofillProfileSyncableService::InjectStartSyncFlare(
     const syncer::SyncableService::StartSyncFlare& flare) {
   flare_ = flare;
 }
 
 AutofillProfileSyncableService::DataBundle::DataBundle() {}
 
 AutofillProfileSyncableService::DataBundle::~DataBundle() {}