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

components/autofill/core/browser/autofill_data_model.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/core/browser/autofill_data_model.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/state_names.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace autofill {
 namespace {
 
@@ skipping 92 matching lines @@
 }
 
 }  // namespace
 
 AutofillDataModel::AutofillDataModel(const std::string& guid,
                                      const std::string& origin)
     : guid_(guid),
       origin_(origin) {}
 AutofillDataModel::~AutofillDataModel() {}
 
-void AutofillDataModel::FillSelectControl(AutofillFieldType type,
+void AutofillDataModel::FillSelectControl(const AutofillType& type,
                                           const std::string& app_locale,
                                           FormFieldData* field) const {
   DCHECK(field);
   DCHECK_EQ("select-one", field->form_control_type);
   DCHECK_EQ(field->option_values.size(), field->option_contents.size());
 
   base::string16 field_text = GetInfo(type, app_locale);
   base::string16 field_text_lower = StringToLowerASCII(field_text);
   if (field_text.empty())
     return;
@@ skipping 13 matching lines @@
       // not found.
       value = field->option_values[i];
     }
   }
 
   if (!value.empty()) {
     field->value = value;
     return;
   }
 
-  if (type == ADDRESS_HOME_STATE || type == ADDRESS_BILLING_STATE) {
+  ServerFieldType server_type = type.server_type();
+  if (server_type == ADDRESS_HOME_STATE ||
+      server_type == ADDRESS_BILLING_STATE) {
     FillStateSelectControl(field_text, field);
-  } else if (type == ADDRESS_HOME_COUNTRY || type == ADDRESS_BILLING_COUNTRY) {
+  } else if (server_type == ADDRESS_HOME_COUNTRY ||
+             server_type == ADDRESS_BILLING_COUNTRY) {
     FillCountrySelectControl(app_locale, field);
-  } else if (type == CREDIT_CARD_EXP_MONTH) {
+  } else if (server_type == CREDIT_CARD_EXP_MONTH) {
     FillExpirationMonthSelectControl(field_text, field);
-  } else if (type == CREDIT_CARD_EXP_4_DIGIT_YEAR) {
+  } else if (server_type == CREDIT_CARD_EXP_4_DIGIT_YEAR) {
     // Attempt to fill the year as a 2-digit year.  This compensates for the
     // fact that our heuristics do not always correctly detect when a website
     // requests a 2-digit rather than a 4-digit year.
-    FillSelectControl(CREDIT_CARD_EXP_2_DIGIT_YEAR, app_locale, field);
-  } else if (type == CREDIT_CARD_TYPE) {
+    FillSelectControl(AutofillType(CREDIT_CARD_EXP_2_DIGIT_YEAR), app_locale,
+                      field);
+  } else if (server_type == CREDIT_CARD_TYPE) {
     FillCreditCardTypeSelectControl(field_text, field);
   }
 }
 
 bool AutofillDataModel::FillCountrySelectControl(
     const std::string& app_locale,
     FormFieldData* field_data) const {
   return false;
 }
 
 bool AutofillDataModel::IsVerified() const {
   return !origin_.empty() && !GURL(origin_).is_valid();
 }
 
 }  // namespace autofill