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

components/autofill/core/browser/autofill_download.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_download.h"
 
 #include <algorithm>
 #include <ostream>
 #include <vector>
 
@@ skipping 21 matching lines @@
 
 namespace {
 const char kAutofillQueryServerNameStartInHeader[] = "GFE/";
 
 const size_t kMaxFormCacheSize = 16;
 
 // Generate field assignments xml that can be manually changed and then fed back
 // into the Autofill server as experiment data.
 static void LogFieldAssignments(
     const FormStructure& form,
-    const FieldTypeSet& available_field_types) {
+    const ServerFieldTypeSet& available_field_types) {
   std::string form_xml;
   if (!form.EncodeFieldAssignments(available_field_types, &form_xml))
     return;
 
   VLOG(1) << "AutofillDownloadManager FieldAssignments for "
           << form.source_url()
           << " :\n"
           << form_xml;
 }
 
@@ skipping 64 matching lines @@
     observer_->OnLoadedServerPredictions(query_data);
     return true;
   }
 
   return StartRequest(form_xml, request_data);
 }
 
 bool AutofillDownloadManager::StartUploadRequest(
     const FormStructure& form,
     bool form_was_autofilled,
-    const FieldTypeSet& available_field_types) {
+    const ServerFieldTypeSet& available_field_types) {
   std::string form_xml;
   if (!form.EncodeUploadRequest(available_field_types, form_was_autofilled,
                                 &form_xml))
     return false;
 
   LogFieldAssignments(form, available_field_types);
 
   if (next_upload_request_ > base::Time::Now()) {
     // We are in back-off mode: do not do the request.
     DVLOG(1) << "AutofillDownloadManager: Upload request is throttled.";
@@ skipping 205 matching lines @@
       }
 
       observer_->OnUploadedPossibleFieldTypes();
     }
   }
   delete it->first;
   url_fetchers_.erase(it);
 }
 
 }  // namespace autofill