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

components/autofill/core/browser/autofill_merge_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 <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
@@ skipping 12 matching lines @@
 
 namespace {
 
 const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");
 const base::FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in");
 
 const char kFieldSeparator[] = ": ";
 const char kProfileSeparator[] = "---";
 const size_t kFieldOffset = arraysize(kFieldSeparator) - 1;
 
-const AutofillFieldType kProfileFieldTypes[] = {
+const ServerFieldType kProfileFieldTypes[] = {
   NAME_FIRST,
   NAME_MIDDLE,
   NAME_LAST,
   EMAIL_ADDRESS,
   COMPANY_NAME,
   ADDRESS_HOME_LINE1,
   ADDRESS_HOME_LINE2,
   ADDRESS_HOME_CITY,
   ADDRESS_HOME_STATE,
   ADDRESS_HOME_ZIP,
@@ skipping 12 matching lines @@
   return dir;
 }
 
 // Serializes the |profiles| into a string.
 std::string SerializeProfiles(const std::vector<AutofillProfile*>& profiles) {
   std::string result;
   for (size_t i = 0; i < profiles.size(); ++i) {
     result += kProfileSeparator;
     result += "\n";
     for (size_t j = 0; j < arraysize(kProfileFieldTypes); ++j) {
-      AutofillFieldType type = kProfileFieldTypes[j];
+      ServerFieldType type = kProfileFieldTypes[j];
       std::vector<base::string16> values;
       profiles[i]->GetRawMultiInfo(type, &values);
       for (size_t k = 0; k < values.size(); ++k) {
         result += AutofillType::FieldTypeToString(type);
         result += kFieldSeparator;
         result += UTF16ToUTF8(values[k]);
         result += "\n";
       }
     }
   }
@@ skipping 125 matching lines @@
     // The first line is always a profile separator, and the last profile is not
     // followed by an explicit separator.
     if ((i > 0 && line == kProfileSeparator) || i == lines.size() - 1) {
       // Reached the end of a profile.  Try to import it.
       FormStructure form_structure(form, std::string());
       for (size_t i = 0; i < form_structure.field_count(); ++i) {
         // Set the heuristic type for each field, which is currently serialized
         // into the field's name.
         AutofillField* field =
             const_cast<AutofillField*>(form_structure.field(i));
-        AutofillFieldType type =
+        ServerFieldType type =
             AutofillType::StringToFieldType(UTF16ToUTF8(field->name));
         field->set_heuristic_type(type);
       }
 
       // Import the profile.
       const CreditCard* imported_credit_card;
       personal_data_.ImportFormData(form_structure, &imported_credit_card);
       EXPECT_EQ(static_cast<const CreditCard*>(NULL), imported_credit_card);
 
       // Clear the |form| to start a new profile.
       form.fields.clear();
     }
   }
 
   *merged_profiles = SerializeProfiles(personal_data_.web_profiles());
 }
 
 TEST_F(AutofillMergeTest, DataDrivenMergeProfiles) {
   RunDataDrivenTest(GetInputDirectory(kTestName), GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }
 
 }  // namespace autofill