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

components/autofill/core/browser/address_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/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/address_field.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 
 class AddressFieldTest : public testing::Test {
  public:
   AddressFieldTest() {}
 
  protected:
   ScopedVector<const AutofillField> list_;
   scoped_ptr<AddressField> field_;
-  FieldTypeMap field_type_map_;
+  ServerFieldTypeMap field_type_map_;
 
   // Downcast for tests.
   static AddressField* Parse(AutofillScanner* scanner) {
     return static_cast<AddressField*>(AddressField::Parse(scanner));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AddressFieldTest);
 };
 
@@ skipping 254 matching lines @@
   field_.reset(Parse(&scanner));
   ASSERT_NE(static_cast<AddressField*>(NULL), field_.get());
   EXPECT_EQ(AddressField::kGenericAddress, field_->FindType());
   ASSERT_TRUE(field_->ClassifyField(&field_type_map_));
   ASSERT_TRUE(
       field_type_map_.find(ASCIIToUTF16("company1")) != field_type_map_.end());
   EXPECT_EQ(COMPANY_NAME, field_type_map_[ASCIIToUTF16("company1")]);
 }
 
 }  // namespace autofill