Allow Safe Browsing backend to select downloads to upload.

chrome/browser/safe_browsing/download_feedback_service.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 "chrome/browser/safe_browsing/download_feedback_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 73 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 DownloadFeedbackService::~DownloadFeedbackService() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 // static
 void DownloadFeedbackService::MaybeStorePingsForDownload(
     DownloadProtectionService::DownloadCheckResult result,
+    bool upload_requested,
     content::DownloadItem* download,
     const std::string& ping,
     const std::string& response) {
+  // Is this result worthy of triggering an upload?
+  bool upload_due_to_result = false;
   switch (result) {
     case DownloadProtectionService::UNKNOWN:
     case DownloadProtectionService::SAFE:
     case DownloadProtectionService::DANGEROUS:
-      return;
+      upload_due_to_result = false;
+      break;
     case DownloadProtectionService::UNCOMMON:
     case DownloadProtectionService::DANGEROUS_HOST:
     case DownloadProtectionService::POTENTIALLY_UNWANTED:
+      upload_due_to_result = true;
       break;  // Fall through.
   }
+
+  if (!upload_requested && !upload_due_to_result)
+    return;
+
+  // Log if the result said no upload, but the server requested it anyway.
+  UMA_HISTOGRAM_BOOLEAN("SBDownloadFeedback.UploadRequestedByServer",
+                        !upload_due_to_result && upload_requested);
+
   UMA_HISTOGRAM_COUNTS("SBDownloadFeedback.SizeEligibleKB",
                        download->GetReceivedBytes() / 1024);
   if (download->GetReceivedBytes() > DownloadFeedback::kMaxUploadSize)
     return;
 
   DownloadFeedbackPings::CreateForDownload(download, ping, response);
 }
 
 // static
 bool DownloadFeedbackService::IsEnabledForDownload(
@@ skipping 88 matching lines @@
 void DownloadFeedbackService::FeedbackComplete() {
   DVLOG(1) << __func__;
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!active_feedback_.empty());
   active_feedback_.pop();
   if (!active_feedback_.empty())
     StartPendingFeedback();
 }
 
 }  // namespace safe_browsing