Adjust traffic annotation in BinaryUploadService

Bug: 980784
Change-Id: Ie37f1281ec068e6114abc815daa02a86a8a31602
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769045
Commit-Queue: Daniel Rubery <drubery@chromium.org>
Reviewed-by: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690409}

chrome/browser/safe_browsing/download_protection/binary_upload_service.cc

@@ -115,20 +115,23 @@ void BinaryUploadService::OnGetFileContents(Request* request,
         policy {
           cookies_allowed: YES
           cookies_store: "Safe Browsing Cookie Store"
-          setting: "No user setting."
+          setting: "This is disabled by default an can only be enabled by "
+            "policy."
           chrome_policy {
             SendFilesForMalwareCheck {
-              policy_options {mode: MANDATORY}
               SendFilesForMalwareCheck: 0
             }
           }
           chrome_policy {
             SendFilesForMalwareCheck {
-              policy_options {mode: MANDATORY}
               SendFilesForMalwareCheck: 1
             }
           }
-        })");
+        }
+        comments: "Setting SendFilesForMalwareCheck to 0 (Do not scan "
+          "downloads) or 1 (Forbid the scanning of downloads) will disable "
+          "this feature"
+        )");
 
   std::string metadata;
   request->deep_scanning_request().SerializeToString(&metadata);

tools/traffic_annotation/summary/annotations.xml

@@ -227,7 +227,7 @@ Refer to README.md for content description and update process.
  <item id="resource_prefetch" hash_code="110815970" type="0" deprecated="2018-02-28" content_hash_code="39251261" file_path=""/>
  <item id="rlz_ping" hash_code="99279418" type="0" content_hash_code="102108802" os_list="windows" file_path="rlz/lib/financial_ping.cc"/>
  <item id="safe_browsing_backup_request" hash_code="106980485" type="0" deprecated="2018-08-14" content_hash_code="101760679" file_path=""/>
- <item id="safe_browsing_binary_upload" hash_code="71663319" type="0" content_hash_code="88524040" os_list="linux,windows" file_path="chrome/browser/safe_browsing/download_protection/binary_upload_service.cc"/>
+ <item id="safe_browsing_binary_upload" hash_code="71663319" type="0" content_hash_code="105913171" os_list="linux,windows" file_path="chrome/browser/safe_browsing/download_protection/binary_upload_service.cc"/>
  <item id="safe_browsing_cache_collector" hash_code="115907811" type="0" content_hash_code="36392362" os_list="linux,windows" file_path="components/safe_browsing/browser/threat_details_cache.cc"/>
  <item id="safe_browsing_certificate_error_reporting" hash_code="66590631" type="0" content_hash_code="50197576" os_list="linux,windows" file_path="chrome/browser/ssl/certificate_error_reporter.cc"/>
  <item id="safe_browsing_chunk_backup_request" hash_code="79957943" type="0" deprecated="2018-08-14" content_hash_code="133850277" file_path=""/>