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

components/autofill/core/browser/form_structure.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 46 matching lines @@
 
   FormStructure(const FormData& form,
                 const std::string& autocheckout_url_prefix);
   virtual ~FormStructure();
 
   // Runs several heuristics against the form fields to determine their possible
   // types.
   void DetermineHeuristicTypes(const AutofillMetrics& metric_logger);
 
   // Encodes the XML upload request from this FormStructure.
-  bool EncodeUploadRequest(const FieldTypeSet& available_field_types,
+  bool EncodeUploadRequest(const ServerFieldTypeSet& available_field_types,
                            bool form_was_autofilled,
                            std::string* encoded_xml) const;
 
   // Encodes a XML block contains autofill field type from this FormStructure.
   // This XML will be written VLOG only, never be sent to server. It will
   // help make FieldAssignments and feed back to autofill server as
   // experiment data.
-  bool EncodeFieldAssignments(const FieldTypeSet& available_field_types,
+  bool EncodeFieldAssignments(const ServerFieldTypeSet& available_field_types,
                               std::string* encoded_xml) const;
 
   // Encodes the XML query request for the set of forms.
   // All fields are returned in one XML. For example, there are three forms,
   // with 2, 4, and 3 fields. The returned XML would have type info for 9
   // fields, first two of which would be for the first form, next 4 for the
   // second, and the rest is for the third.
   static bool EncodeQueryRequest(const std::vector<FormStructure*>& forms,
                                  std::vector<std::string>* encoded_signatures,
                                  std::string* encoded_xml);
@@ skipping 177 matching lines @@
 
   // Whether or not this form was filled by Autocheckout.
   bool filled_by_autocheckout_;
 
   DISALLOW_COPY_AND_ASSIGN(FormStructure);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_