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

chrome/browser/autofill/autofill_field_unittest.cc

 // Copyright (c) 2011 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 "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 28 matching lines @@
   EXPECT_TRUE(field.IsEmpty());
 
   // Field value is non-empty.
   field.value = ASCIIToUTF16("Value");
   EXPECT_FALSE(field.IsEmpty());
 }
 
 TEST(AutofillFieldTest, FieldSignature) {
   AutofillField field;
   ASSERT_EQ(string16(), field.name);
-  ASSERT_EQ(string16(), field.form_control_type);
+  ASSERT_EQ(std::string(), field.form_control_type);
 
   // Signature is empty.
   EXPECT_EQ("2085434232", field.FieldSignature());
 
   // Field name is set.
   field.name = ASCIIToUTF16("Name");
   EXPECT_EQ("1606968241", field.FieldSignature());
 
   // Field form control type is set.
-  field.form_control_type = ASCIIToUTF16("Text");
-  EXPECT_EQ("4246049809", field.FieldSignature());
+  field.form_control_type = "text";
+  EXPECT_EQ("502192749", field.FieldSignature());
 
   // Heuristic type does not affect FieldSignature.
   field.set_heuristic_type(NAME_FIRST);
-  EXPECT_EQ("4246049809", field.FieldSignature());
+  EXPECT_EQ("502192749", field.FieldSignature());
 
   // Server type does not affect FieldSignature.
   field.set_server_type(NAME_LAST);
-  EXPECT_EQ("4246049809", field.FieldSignature());
+  EXPECT_EQ("502192749", field.FieldSignature());
 }
 
 TEST(AutofillFieldTest, IsFieldFillable) {
   AutofillField field;
   ASSERT_EQ(UNKNOWN_TYPE, field.type());
 
   // Type is unknown.
   EXPECT_FALSE(field.IsFieldFillable());
 
   // Only heuristic type is set.
   field.set_heuristic_type(NAME_FIRST);
   EXPECT_TRUE(field.IsFieldFillable());
 
   // Only server type is set.
   field.set_heuristic_type(UNKNOWN_TYPE);
   field.set_server_type(NAME_LAST);
   EXPECT_TRUE(field.IsFieldFillable());
 
   // Both types set.
   field.set_heuristic_type(NAME_FIRST);
   field.set_server_type(NAME_LAST);
   EXPECT_TRUE(field.IsFieldFillable());
 }
 
 }  // namespace