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

chrome/browser/ui/webui/options/autofill_options_handler.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/ui/webui/options/autofill_options_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 14 matching lines @@
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/component_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/webui/web_ui_util.h"
 
 using autofill::AutofillCountry;
-using autofill::AutofillFieldType;
+using autofill::ServerFieldType;
 using autofill::AutofillProfile;
 using autofill::CreditCard;
 using autofill::PersonalDataManager;
 
 namespace {
 
 const char kSettingsOrigin[] = "Chrome settings";
 
 // Sets data related to the country <select>.
 void SetCountryData(DictionaryValue* localized_strings) {
@@ skipping 24 matching lines @@
     details->SetString("stateLabel", countries[i]->state_label());
     country_data->Set(countries[i]->country_code(), details.release());
 
   }
   localized_strings->Set("autofillCountrySelectList", country_list.release());
   localized_strings->Set("autofillCountryData", country_data.release());
 }
 
 // Get the multi-valued element for |type| and return it in |ListValue| form.
 void GetValueList(const AutofillProfile& profile,
-                  AutofillFieldType type,
+                  ServerFieldType type,
                   scoped_ptr<ListValue>* list) {
   list->reset(new ListValue);
 
   std::vector<string16> values;
   profile.GetRawMultiInfo(type, &values);
 
   // |GetRawMultiInfo()| always returns at least one, potentially empty, item.
   if (values.size() == 1 && values.front().empty())
     return;
 
   for (size_t i = 0; i < values.size(); ++i) {
     (*list)->Set(i, new base::StringValue(values[i]));
   }
 }
 
 // Set the multi-valued element for |type| from input |list| values.
 void SetValueList(const ListValue* list,
-                  AutofillFieldType type,
+                  ServerFieldType type,
                   AutofillProfile* profile) {
   std::vector<string16> values(list->GetSize());
   for (size_t i = 0; i < list->GetSize(); ++i) {
     string16 value;
     if (list->GetString(i, &value))
       values[i] = value;
   }
   profile->SetRawMultiInfo(type, values);
 }
 
@@ skipping 490 matching lines @@
 
   web_ui()->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
 
 bool AutofillOptionsHandler::IsPersonalDataLoaded() const {
   return personal_data_ && personal_data_->IsDataLoaded();
 }
 
 }  // namespace options