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

components/autofill/core/browser/autofill_field_unittest.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 "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_field.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 namespace {
 
 TEST(AutofillFieldTest, Type) {
   AutofillField field;
   ASSERT_EQ(NO_SERVER_DATA, field.server_type());
   ASSERT_EQ(UNKNOWN_TYPE, field.heuristic_type());
 
   // |server_type_| is NO_SERVER_DATA, so |heuristic_type_| is returned.
-  EXPECT_EQ(UNKNOWN_TYPE, field.type());
+  EXPECT_EQ(UNKNOWN_TYPE, field.Type().server_type());
 
   // Set the heuristic type and check it.
   field.set_heuristic_type(NAME_FIRST);
-  EXPECT_EQ(NAME_FIRST, field.type());
+  EXPECT_EQ(NAME_FIRST, field.Type().server_type());
 
   // Set the server type and check it.
   field.set_server_type(ADDRESS_BILLING_LINE1);
-  EXPECT_EQ(ADDRESS_BILLING_LINE1, field.type());
+  EXPECT_EQ(ADDRESS_BILLING_LINE1, field.Type().server_type());
 
   // Remove the server type to make sure the heuristic type is preserved.
   field.set_server_type(NO_SERVER_DATA);
-  EXPECT_EQ(NAME_FIRST, field.type());
+  EXPECT_EQ(NAME_FIRST, field.Type().server_type());
 }
 
 TEST(AutofillFieldTest, IsEmpty) {
   AutofillField field;
   ASSERT_EQ(base::string16(), field.value);
 
   // Field value is empty.
   EXPECT_TRUE(field.IsEmpty());
 
   // Field value is non-empty.
@@ skipping 21 matching lines @@
   field.set_heuristic_type(NAME_FIRST);
   EXPECT_EQ("502192749", field.FieldSignature());
 
   // Server type does not affect FieldSignature.
   field.set_server_type(NAME_LAST);
   EXPECT_EQ("502192749", field.FieldSignature());
 }
 
 TEST(AutofillFieldTest, IsFieldFillable) {
   AutofillField field;
-  ASSERT_EQ(UNKNOWN_TYPE, field.type());
+  ASSERT_EQ(UNKNOWN_TYPE, field.Type().server_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
 }  // namespace autofill