[Autofill] Update the autocomplete types implementation to match the current HTML spec.

chrome/browser/autofill/autofill_manager.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/autofill/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 101 matching lines @@
   labels->swap(labels_copy);
   icons->swap(icons_copy);
   unique_ids->swap(unique_ids_copy);
 }
 
 // Precondition: |form_structure| and |form| should correspond to the same
 // logical form.  Returns true if any field in the given |section| within |form|
 // is auto-filled.
 bool SectionIsAutofilled(const FormStructure& form_structure,
                          const FormData& form,
-                         const string16& section) {
+                         const std::string& section) {
   DCHECK_EQ(form_structure.field_count(), form.fields.size());
   for (size_t i = 0; i < form_structure.field_count(); ++i) {
     if (form_structure.field(i)->section() == section &&
         form.fields[i].is_autofilled) {
       return true;
     }
   }
 
   return false;
 }
@@ skipping 1094 matching lines @@
     }
   }
 }
 
 void AutofillManager::FillCreditCardFormField(const CreditCard& credit_card,
                                               AutofillFieldType type,
                                               FormFieldData* field) {
   DCHECK_EQ(AutofillType::CREDIT_CARD, AutofillType(type).group());
   DCHECK(field);
 
-  if (field->form_control_type == ASCIIToUTF16("select-one")) {
+  if (field->form_control_type == "select-one") {
     autofill::FillSelectControl(credit_card, type, field);
-  } else if (field->form_control_type == ASCIIToUTF16("month")) {
+  } else if (field->form_control_type == "month") {
     // HTML5 input="month" consists of year-month.
     string16 year =
         credit_card.GetCanonicalizedInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR);
     string16 month = credit_card.GetCanonicalizedInfo(CREDIT_CARD_EXP_MONTH);
     if (!year.empty() && !month.empty()) {
       // Fill the value only if |credit_card| includes both year and month
       // information.
       field->value = year + ASCIIToUTF16("-") + month;
     }
   } else {
     field->value = credit_card.GetCanonicalizedInfo(type);
   }
 }
 
 void AutofillManager::FillFormField(const AutofillProfile& profile,
                                     const AutofillField& cached_field,
                                     size_t variant,
                                     FormFieldData* field) {
   AutofillFieldType type = cached_field.type();
   DCHECK_NE(AutofillType::CREDIT_CARD, AutofillType(type).group());
   DCHECK(field);
 
   if (type == PHONE_HOME_NUMBER) {
     FillPhoneNumberField(profile, cached_field, variant, field);
   } else {
-    if (field->form_control_type == ASCIIToUTF16("select-one")) {
+    if (field->form_control_type == "select-one") {
       autofill::FillSelectControl(profile, type, field);
     } else {
       std::vector<string16> values;
       profile.GetCanonicalizedMultiInfo(type, &values);
       if (variant >= values.size()) {
         // If the variant is unavailable, bail.  This case is reachable, for
         // example if Sync updates a profile during the filling process.
         return;
       }
 
@@ skipping 124 matching lines @@
   *profile_guid = IDToGUID(profile_id);
 }
 
 void AutofillManager::UpdateInitialInteractionTimestamp(
     const TimeTicks& interaction_timestamp) {
   if (initial_interaction_timestamp_.is_null() ||
       interaction_timestamp < initial_interaction_timestamp_) {
     initial_interaction_timestamp_ = interaction_timestamp;
   }
 }