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

chrome/browser/autofill/form_structure_browsertest.cc

 // Copyright (c) 2012 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/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 72 matching lines @@
     const std::vector<FormStructure*>& forms) {
   std::string forms_string;
   for (std::vector<FormStructure*>::const_iterator iter = forms.begin();
        iter != forms.end();
        ++iter) {
 
     for (std::vector<AutofillField*>::const_iterator field_iter =
             (*iter)->begin();
          field_iter != (*iter)->end();
          ++field_iter) {
-      forms_string += AutofillType::FieldTypeToString((*field_iter)->type());
+      forms_string +=
+          AutofillType::FieldTypeToString((*field_iter)->Type().server_type());
       forms_string += " | " + UTF16ToUTF8((*field_iter)->name);
       forms_string += " | " + UTF16ToUTF8((*field_iter)->label);
       forms_string += " | " + UTF16ToUTF8((*field_iter)->value);
       forms_string += "\n";
     }
   }
   return forms_string;
 }
 
 // Heuristics tests timeout on Windows.  See http://crbug.com/85276
@@ skipping 166 matching lines @@
 IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
     MAYBE_DataDrivenHeuristics(20)) {
   const base::FilePath::CharType kFileNamePattern[] =
       FILE_PATH_LITERAL("20_*.html");
   RunDataDrivenTest(GetInputDirectory(kTestName),
                     GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }
 
 }  // namespace autofill