Set datapresent string to contain precisely those field types available in stored Autofill data.

chrome/browser/autofill/autofill_download.cc

 // Copyright (c) 2011 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 "chrome/browser/autofill/autofill_download.h"
 
 #include <algorithm>
 #include <ostream>
 #include <vector>
 
@@ skipping 83 matching lines @@
             << "the cache";
     if (observer_)
       observer_->OnLoadedAutofillHeuristics(query_data);
     return true;
   }
 
   return StartRequest(form_xml, request_data);
 }
 
 bool AutofillDownloadManager::StartUploadRequest(
-    const FormStructure& form, bool form_was_matched) {
+    const FormStructure& form,
+    bool form_was_autofilled,
+    const FieldTypeSet& available_field_types) {
   if (next_upload_request_ > base::Time::Now()) {
     // We are in back-off mode: do not do the request.
+    VLOG(1) << "AutofillDownloadManager: Upload request is throttled.";
     return false;
   }
 
-  // Check if we need to upload form.
-  double upload_rate = form_was_matched ? GetPositiveUploadRate() :
-                                          GetNegativeUploadRate();
+  // Flip a coin to see if we should upload this form.
+  double upload_rate = form_was_autofilled ? GetPositiveUploadRate() :
+                                             GetNegativeUploadRate();
   if (base::RandDouble() > upload_rate) {
-    VLOG(1) << "AutofillDownloadManager: Upload request is ignored";
+    VLOG(1) << "AutofillDownloadManager: Upload request is ignored.";
     // If we ever need notification that upload was skipped, add it here.
     return false;
   }
+
   std::string form_xml;
-  if (!form.EncodeUploadRequest(form_was_matched, &form_xml))
+  if (!form.EncodeUploadRequest(available_field_types, form_was_autofilled,
+                                &form_xml))
     return false;
 
   FormRequestData request_data;
   request_data.form_signatures.push_back(form.FormSignature());
   request_data.request_type = AutofillDownloadManager::REQUEST_UPLOAD;
 
   return StartRequest(form_xml, request_data);
 }
 
 bool AutofillDownloadManager::CancelRequest(
@@ skipping 208 matching lines @@
         SetNegativeUploadRate(new_negative_upload_rate);
       }
 
       if (observer_)
         observer_->OnUploadedAutofillHeuristics(it->second.form_signatures[0]);
     }
   }
   delete it->first;
   url_fetchers_.erase(it);
 }