Network traffic annotation added to safe_browsing

chrome/browser/safe_browsing/download_feedback.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.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 110 matching lines @@
       ping_request_);
   DCHECK(r);
   r = report_metadata.mutable_download_response()->ParseFromString(
       ping_response_);
   DCHECK(r);
   file_size_ = report_metadata.download_request().length();
 
   std::string metadata_string;
   bool ok = report_metadata.SerializeToString(&metadata_string);
   DCHECK(ok);
+
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("safe_browsing_feedback", R"(
+        semantics {
+          sender: "Safe Browsing Download Protection Feedback"
+          description:
+            "When a user downloads a binary that Safe Browsing declares as "
+            "suspicious, opted-in clients may upload that binary to Safe "
+            "Browsing to improve the classification. This helps protect users "
+            "from malware and unwanted software."
+          trigger:
+            "The browser will upload the binary to Google when a "
+            "download-protection verdict is 'Not Safe', and the user is opted "
+            "in to extended-reporting."
+          data:
+            "The suspicious binary file."
+          destination: GOOGLE_OWNED_SERVICE
+        }
+        policy {
+          cookies_allowed: true
+          cookies_store: "Safe Browsing Cookie Store"
+          setting:
+            "Users can enable or disable this feature by stopping sending "
+            "security incident reports to Google via disabling 'Automatically "
+            "report details of possible security incdients to Google.' in "

[Nathan Parker, 2017/03/06 17:48:54]

spelling: incidents

[Ramin Halavati, 2017/03/07 08:24:47]

Done.

+            "Chrome's settings under Advanced Settings, Privacy. The feature "
+            "is enabled by default."

[Nathan Parker, 2017/03/06 17:48:54]

should be:
"is disabled by default"

[Ramin Halavati, 2017/03/07 08:24:47]

Done.

+          policy {
+            SafeBrowsingExtendedReportingOptInAllowed {
+              policy_options {mode: MANDATORY}
+              value: false
+            }
+          }
+        })");
+
   uploader_ = TwoPhaseUploader::Create(
       request_context_getter_.get(), file_task_runner_.get(),
       GURL(kSbFeedbackURL), metadata_string, file_path_,
       TwoPhaseUploader::ProgressCallback(),
       base::Bind(&DownloadFeedbackImpl::FinishedUpload, base::Unretained(this),
-                 finish_callback));
+                 finish_callback),
+      traffic_annotation);
   uploader_->Start();
 }
 
 void DownloadFeedbackImpl::FinishedUpload(base::Closure finish_callback,
                                           TwoPhaseUploader::State state,
                                           int net_error,
                                           int response_code,
                                           const std::string& response_data) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DVLOG(1) << __func__ << " " << state << " rlen=" << response_data.size();
@@ skipping 64 matching lines @@
         new DownloadFeedbackImpl(request_context_getter, file_task_runner,
                                  file_path, ping_request, ping_response));
   }
   return DownloadFeedback::factory_->CreateDownloadFeedback(
         request_context_getter, file_task_runner, file_path, ping_request,
         ping_response);
 }
 
 }  // namespace safe_browsing