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>
 
@@ skipping 15 matching lines @@
 const char kStartHeader[] = "x-goog-resumable: start";
 
 // Header returned on initial response with URL to use for the second phase.
 const char kLocationHeader[] = "Location";
 
 const char kUploadContentType[] = "application/octet-stream";
 
 class TwoPhaseUploaderImpl : public net::URLFetcherDelegate,
                              public TwoPhaseUploader {
  public:
-  TwoPhaseUploaderImpl(net::URLRequestContextGetter* url_request_context_getter,
-                       base::TaskRunner* file_task_runner,
-                       const GURL& base_url,
-                       const std::string& metadata,
-                       const base::FilePath& file_path,
-                       const ProgressCallback& progress_callback,
-                       const FinishCallback& finish_callback);
+  TwoPhaseUploaderImpl(
+      net::URLRequestContextGetter* url_request_context_getter,
+      base::TaskRunner* file_task_runner,
+      const GURL& base_url,
+      const std::string& metadata,
+      const base::FilePath& file_path,
+      const ProgressCallback& progress_callback,
+      const FinishCallback& finish_callback,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation);
   ~TwoPhaseUploaderImpl() override;
 
   // Begins the upload process.
   void Start() override;
 
   // net::URLFetcherDelegate implementation:
   void OnURLFetchComplete(const net::URLFetcher* source) override;
   void OnURLFetchUploadProgress(const net::URLFetcher* source,
                                 int64_t current,
                                 int64_t total) override;
 
  private:
   void UploadMetadata();
   void UploadFile();
   void Finish(int net_error, int response_code, const std::string& response);
 
   State state_;
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
   scoped_refptr<base::TaskRunner> file_task_runner_;
   GURL base_url_;
   GURL upload_url_;
   std::string metadata_;
   const base::FilePath file_path_;
   ProgressCallback progress_callback_;
   FinishCallback finish_callback_;
+  net::NetworkTrafficAnnotationTag traffic_annotation_;
 
   std::unique_ptr<net::URLFetcher> url_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(TwoPhaseUploaderImpl);
 };
 
 TwoPhaseUploaderImpl::TwoPhaseUploaderImpl(
     net::URLRequestContextGetter* url_request_context_getter,
     base::TaskRunner* file_task_runner,
     const GURL& base_url,
     const std::string& metadata,
     const base::FilePath& file_path,
     const ProgressCallback& progress_callback,
-    const FinishCallback& finish_callback)
+    const FinishCallback& finish_callback,
+    const net::NetworkTrafficAnnotationTag& traffic_annotation)
     : state_(STATE_NONE),
       url_request_context_getter_(url_request_context_getter),
       file_task_runner_(file_task_runner),
       base_url_(base_url),
       metadata_(metadata),
       file_path_(file_path),
       progress_callback_(progress_callback),
-      finish_callback_(finish_callback) {
+      finish_callback_(finish_callback),
+      traffic_annotation_(traffic_annotation) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 TwoPhaseUploaderImpl::~TwoPhaseUploaderImpl() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 void TwoPhaseUploaderImpl::Start() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK_EQ(STATE_NONE, state_);
@@ skipping 61 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);
+  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);
+  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,
                                   int response_code,
                                   const std::string& response) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   finish_callback_.Run(state_, net_error, response_code, response);
 }
 
 }  // namespace
 
 // static
 TwoPhaseUploaderFactory* TwoPhaseUploader::factory_ = nullptr;
 
 // static
 std::unique_ptr<TwoPhaseUploader> TwoPhaseUploader::Create(
     net::URLRequestContextGetter* url_request_context_getter,
     base::TaskRunner* file_task_runner,
     const GURL& base_url,
     const std::string& metadata,
     const base::FilePath& file_path,
     const ProgressCallback& progress_callback,
-    const FinishCallback& finish_callback) {
+    const FinishCallback& finish_callback,
+    const net::NetworkTrafficAnnotationTag& traffic_annotation) {
   if (!factory_) {
     return base::WrapUnique(new TwoPhaseUploaderImpl(
         url_request_context_getter, file_task_runner, base_url, metadata,
-        file_path, progress_callback, finish_callback));
+        file_path, progress_callback, finish_callback, traffic_annotation));
   }
   return TwoPhaseUploader::factory_->CreateTwoPhaseUploader(
       url_request_context_getter, file_task_runner, base_url, metadata,
-      file_path, progress_callback, finish_callback);
+      file_path, progress_callback, finish_callback, traffic_annotation);
 }