[Autofill] Add a separate enumeration for HTML field type hints.

components/autofill/content/browser/autocheckout_manager.cc

 // Copyright 2013 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 "components/autofill/content/browser/autocheckout_manager.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/browser/autocheckout_request_manager.h"
@@ skipping 338 matching lines @@
   metric_logger_->LogAutocheckoutBuyFlowMetric(
       AutofillMetrics::AUTOCHECKOUT_BUY_FLOW_STARTED);
 
   profile_.reset(new AutofillProfile());
   credit_card_.reset(new CreditCard());
   billing_address_.reset(new AutofillProfile());
 
   for (size_t i = 0; i < result->field_count(); ++i) {
     const AutofillType& type = result->field(i)->Type();
     const base::string16& value = result->field(i)->value;
-    if (type.server_type() == CREDIT_CARD_VERIFICATION_CODE) {
+    ServerFieldType server_type = type.GetStorableType();
+    if (server_type == CREDIT_CARD_VERIFICATION_CODE) {
       cvv_ = result->field(i)->value;
       continue;
     }
     FieldTypeGroup group = type.group();
     if (group == CREDIT_CARD) {
-      credit_card_->SetRawInfo(type.server_type(), value);
+      credit_card_->SetRawInfo(server_type, value);
       // TODO(dgwallinga): Find a way of cleanly deprecating CREDIT_CARD_NAME.
       // code.google.com/p/chromium/issues/detail?id=263498
-      if (type.server_type() == CREDIT_CARD_NAME)
+      if (server_type == CREDIT_CARD_NAME)
         billing_address_->SetRawInfo(NAME_BILLING_FULL, value);
-    } else if (type.server_type() == ADDRESS_HOME_COUNTRY) {
-      profile_->SetInfo(type, value, autofill_manager_->app_locale());
-    } else if (type.server_type() == ADDRESS_BILLING_COUNTRY) {
-      billing_address_->SetInfo(type, value, autofill_manager_->app_locale());
+    } else if (server_type == ADDRESS_HOME_COUNTRY) {
+      if (IsBillingGroup(group))
+        billing_address_->SetInfo(type, value, autofill_manager_->app_locale());
+      else
+        profile_->SetInfo(type, value, autofill_manager_->app_locale());
     } else if (IsBillingGroup(group)) {
-      billing_address_->SetRawInfo(type.server_type(), value);
+      billing_address_->SetRawInfo(server_type, value);
     } else {
-      profile_->SetRawInfo(type.server_type(), value);
+      profile_->SetRawInfo(server_type, value);
     }
   }
 
   // Page types only available in first-page meta data, so save
   // them for use later as we navigate.
   page_types_ = page_meta_data_->page_types;
   SetStepProgressForPage(page_meta_data_->current_page_number,
                          AUTOCHECKOUT_STEP_STARTED);
 
   FillForms();
@@ skipping 59 matching lines @@
 }
 
 void AutocheckoutManager::SetValue(const AutofillField& field,
                                    FormFieldData* field_to_fill) {
   // No-op if Autofill server doesn't know about the field.
   if (field.server_type() == NO_SERVER_DATA)
     return;
 
   const AutofillType& type = field.Type();
 
-  if (type.server_type() == FIELD_WITH_DEFAULT_VALUE) {
+  ServerFieldType server_type = type.GetStorableType();
+  if (server_type == FIELD_WITH_DEFAULT_VALUE) {
     // For a form with radio buttons, like:
     // <form>
     //   <input type="radio" name="sex" value="male">Male<br>
     //   <input type="radio" name="sex" value="female">Female
     // </form>
     // If the default value specified at the server is "female", then
     // Autofill server responds back with following field mappings
     //   (fieldtype: FIELD_WITH_DEFAULT_VALUE, value: "female")
     //   (fieldtype: FIELD_WITH_DEFAULT_VALUE, value: "female")
     // Note that, the field mapping is repeated twice to respond to both the
@@ skipping 13 matching lines @@
     } else if (field.form_control_type == "select-one") {
       field_to_fill->value = default_value;
     } else {
       // FIELD_WITH_DEFAULT_VALUE should not be used for other type of fields.
       NOTREACHED();
     }
     return;
   }
 
   // Handle verification code directly.
-  if (type.server_type() == CREDIT_CARD_VERIFICATION_CODE) {
+  if (server_type == CREDIT_CARD_VERIFICATION_CODE) {
     field_to_fill->value = cvv_;
     return;
   }
 
   if (type.group() == CREDIT_CARD) {
     credit_card_->FillFormField(
         field, 0, autofill_manager_->app_locale(), field_to_fill);
   } else if (IsBillingGroup(type.group())) {
     billing_address_->FillFormField(
         field, 0, autofill_manager_->app_locale(), field_to_fill);
@@ skipping 67 matching lines @@
 
   SendAutocheckoutStatus(status);
   if (status == SUCCESS)
     autofill_manager_->delegate()->OnAutocheckoutSuccess();
   else
     autofill_manager_->delegate()->OnAutocheckoutError();
   in_autocheckout_flow_ = false;
 }
 
 }  // namespace autofill