Network traffic annotation added to URLLoaderImpl.

content/common/throttling_url_loader.cc

 // Copyright 2017 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 "content/common/throttling_url_loader.h"
 
 namespace content {
 
 // static
 std::unique_ptr<ThrottlingURLLoader> ThrottlingURLLoader::CreateLoaderAndStart(
     mojom::URLLoaderFactory* factory,
     std::vector<std::unique_ptr<URLLoaderThrottle>> throttles,
     int32_t routing_id,
     int32_t request_id,
     uint32_t options,
     std::unique_ptr<ResourceRequest> url_request,
-    mojom::URLLoaderClient* client) {
-  std::unique_ptr<ThrottlingURLLoader> loader(
-      new ThrottlingURLLoader(std::move(throttles), client));
+    mojom::URLLoaderClient* client,
+    const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
+  std::unique_ptr<ThrottlingURLLoader> loader(new ThrottlingURLLoader(
+      std::move(throttles), client, traffic_annotation));
   loader->Start(factory, routing_id, request_id, options,
                 std::move(url_request));
   return loader;
 }
 
 ThrottlingURLLoader::~ThrottlingURLLoader() {}
 
 void ThrottlingURLLoader::FollowRedirect() {
   if (url_loader_)
     url_loader_->FollowRedirect();
 }
 
 void ThrottlingURLLoader::SetPriority(net::RequestPriority priority,
                                       int32_t intra_priority_value) {
   if (!url_loader_ && !cancelled_by_throttle_) {
     DCHECK_EQ(DEFERRED_START, deferred_stage_);
     set_priority_cached_ = true;
     priority_ = priority;
     intra_priority_value_ = intra_priority_value;
     return;
   }
 
   url_loader_->SetPriority(priority, intra_priority_value);
 }
 
 ThrottlingURLLoader::ThrottlingURLLoader(
     std::vector<std::unique_ptr<URLLoaderThrottle>> throttles,
-    mojom::URLLoaderClient* client)
-    : forwarding_client_(client), client_binding_(this) {
+    mojom::URLLoaderClient* client,
+    const net::MutableNetworkTrafficAnnotationTag& traffic_annotation)
+    : forwarding_client_(client),
+      client_binding_(this),
+      traffic_annotation_(traffic_annotation) {
   if (throttles.size() > 0) {
     // TODO(yzshen): Implement a URLLoaderThrottle subclass which handles a list
     // of URLLoaderThrottles.
     CHECK_EQ(1u, throttles.size());
     throttle_ = std::move(throttles[0]);
     throttle_->set_delegate(this);
   }
 }
 
 void ThrottlingURLLoader::Start(mojom::URLLoaderFactory* factory,
@@ skipping 17 matching lines @@
       routing_id_ = routing_id;
       request_id_ = request_id;
       options_ = options;
       url_request_ = std::move(url_request);
       return;
     }
   }
 
   factory->CreateLoaderAndStart(mojo::MakeRequest(&url_loader_), routing_id,
                                 request_id, options, *url_request,
-                                client_binding_.CreateInterfacePtrAndBind());
+                                client_binding_.CreateInterfacePtrAndBind(),
+                                traffic_annotation_);
 }
 
 void ThrottlingURLLoader::OnReceiveResponse(
     const ResourceResponseHead& response_head,
     const base::Optional<net::SSLInfo>& ssl_info,
     mojom::DownloadedTempFilePtr downloaded_file) {
   DCHECK_EQ(DEFERRED_NONE, deferred_stage_);
   DCHECK(!cancelled_by_throttle_);
 
   if (throttle_) {
@@ skipping 110 matching lines @@
 }
 
 void ThrottlingURLLoader::Resume() {
   if (cancelled_by_throttle_ || deferred_stage_ == DEFERRED_NONE)
     return;
 
   switch (deferred_stage_) {
     case DEFERRED_START: {
       url_loader_factory_->CreateLoaderAndStart(
           mojo::MakeRequest(&url_loader_), routing_id_, request_id_, options_,
-          *url_request_, client_binding_.CreateInterfacePtrAndBind());
+          *url_request_, client_binding_.CreateInterfacePtrAndBind(),
+          traffic_annotation_);
 
       if (set_priority_cached_) {
         set_priority_cached_ = false;
         url_loader_->SetPriority(priority_, intra_priority_value_);
       }
       break;
     }
     case DEFERRED_REDIRECT: {
       client_binding_.ResumeIncomingMethodCallProcessing();
       forwarding_client_->OnReceiveRedirect(redirect_info_, response_head_);
       break;
     }
     case DEFERRED_RESPONSE: {
       client_binding_.ResumeIncomingMethodCallProcessing();
       forwarding_client_->OnReceiveResponse(response_head_, ssl_info_,
                                             std::move(downloaded_file_));
       break;
     }
     default:
       NOTREACHED();
       break;
   }
   deferred_stage_ = DEFERRED_NONE;
 }
 
 }  // namespace content