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

components/autofill/core/browser/autofill_data_model_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 "components/autofill/core/browser/autofill_data_model.h"
 
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 
 namespace {
 
 // Provides concrete implementations for pure virtual methods.
 class TestAutofillDataModel : public AutofillDataModel {
  public:
   TestAutofillDataModel(const std::string& guid, const std::string& origin)
       : AutofillDataModel(guid, origin) {}
   virtual ~TestAutofillDataModel() {}
 
  private:
-  virtual base::string16 GetRawInfo(AutofillFieldType type) const OVERRIDE {
+  virtual base::string16 GetRawInfo(ServerFieldType type) const OVERRIDE {
     return base::string16();
   }
-  virtual void SetRawInfo(AutofillFieldType type,
+  virtual void SetRawInfo(ServerFieldType type,
                           const base::string16& value) OVERRIDE {}
   virtual void GetSupportedTypes(
-      FieldTypeSet* supported_types) const OVERRIDE {}
+      ServerFieldTypeSet* supported_types) const OVERRIDE {}
   virtual void FillFormField(const AutofillField& field,
                              size_t variant,
                              const std::string& app_locale,
                              FormFieldData* field_data) const OVERRIDE {}
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDataModel);
 };
 
 }  // namespace
 
@@ skipping 20 matching lines @@
   EXPECT_TRUE(model.IsVerified());
 
   model.set_origin("Some gibberish string");
   EXPECT_TRUE(model.IsVerified());
 
   model.set_origin(std::string());
   EXPECT_FALSE(model.IsVerified());
 }
 
 }  // namespace autofill