Network traffic annotation added to safe_browsing

chrome/browser/safe_browsing/two_phase_uploader.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/two_phase_uploader.h"
 
 #include <stdint.h>
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/task_runner.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 
 namespace {
 
 // Header sent on initial request to start the two phase upload process.
 const char kStartHeader[] = "x-goog-resumable: start";
 
 // Header returned on initial response with URL to use for the second phase.
@@ skipping 132 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DVLOG(3) << __func__ << " " << source->GetURL().spec() << " " << current
            << "/" << total;
   if (state_ == UPLOAD_FILE && !progress_callback_.is_null())
     progress_callback_.Run(current, total);
 }
 
 void TwoPhaseUploaderImpl::UploadMetadata() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   state_ = UPLOAD_METADATA;
-  url_fetcher_ =
-      net::URLFetcher::Create(base_url_, net::URLFetcher::POST, this);
+
+  // Create traffic annotation tag.

[mattm, 2017/02/18 02:23:45]

Although TwoPhaseUploader is only used in one place currently, it just
implements a non-safebrowsing-specific protocol (so it depends entirely on what
URL and data it's created with), so it may be better to pass the annotations in?

[Ramin Halavati, 2017/02/20 09:08:35]

Done.

+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("...", R"(

[Nathan Parker, 2017/02/18 22:16:55]

Is there a doc describing the intention of these fields, and how they'll be
used?

[Ramin Halavati, 2017/02/20 09:08:35]

Yes, there are references on the first email on this CL. If there are any
ambiguities, please tell me to describe them.

+        semantics {
+          sender: "..."
+          description: "..."
+          trigger: "..."
+          data: "..."
+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER
+        }
+        policy {
+          cookies_allowed: false/true
+          cookies_store: "..."
+          setting: "..."
+          policy {
+            [POLICY_NAME] {
+              policy_options {mode: MANDATORY/RECOMMENDED/UNSET}
+              value: ...
+            }
+          }
+          policy_exception_justification: "..."
+        })");
+
+  url_fetcher_ = net::URLFetcher::Create(base_url_, net::URLFetcher::POST, this,
+                                         traffic_annotation);
   data_use_measurement::DataUseUserData::AttachToFetcher(
       url_fetcher_.get(), data_use_measurement::DataUseUserData::SAFE_BROWSING);
   url_fetcher_->SetRequestContext(url_request_context_getter_.get());
   url_fetcher_->SetExtraRequestHeaders(kStartHeader);
   url_fetcher_->SetUploadData(kUploadContentType, metadata_);
   url_fetcher_->Start();
 }
 
 void TwoPhaseUploaderImpl::UploadFile() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   state_ = UPLOAD_FILE;
 
-  url_fetcher_ =
-      net::URLFetcher::Create(upload_url_, net::URLFetcher::PUT, this);
+  // Create traffic annotation tag.
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("...", R"(
+        semantics {
+          sender: "..."
+          description: "..."
+          trigger: "..."
+          data: "..."
+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER
+        }
+        policy {
+          cookies_allowed: false/true
+          cookies_store: "..."
+          setting: "..."
+          policy {
+            [POLICY_NAME] {
+              policy_options {mode: MANDATORY/RECOMMENDED/UNSET}
+              value: ...
+            }
+          }
+          policy_exception_justification: "..."
+        })");
+
+  url_fetcher_ = net::URLFetcher::Create(upload_url_, net::URLFetcher::PUT,
+                                         this, traffic_annotation);
   data_use_measurement::DataUseUserData::AttachToFetcher(
       url_fetcher_.get(), data_use_measurement::DataUseUserData::SAFE_BROWSING);
   url_fetcher_->SetRequestContext(url_request_context_getter_.get());
   url_fetcher_->SetUploadFilePath(kUploadContentType, file_path_, 0,
                                   std::numeric_limits<uint64_t>::max(),
                                   file_task_runner_);
   url_fetcher_->Start();
 }
 
 void TwoPhaseUploaderImpl::Finish(int net_error,
@@ skipping 19 matching lines @@
     const FinishCallback& finish_callback) {
   if (!factory_) {
     return base::WrapUnique(new TwoPhaseUploaderImpl(
         url_request_context_getter, file_task_runner, base_url, metadata,
         file_path, progress_callback, finish_callback));
   }
   return TwoPhaseUploader::factory_->CreateTwoPhaseUploader(
       url_request_context_getter, file_task_runner, base_url, metadata,
       file_path, progress_callback, finish_callback);
 }