Network traffic annotation added to URLLoaderImpl.

content/browser/loader/navigation_url_loader_network_service.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/browser/loader/navigation_url_loader_network_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 18 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/navigation_data.h"
 #include "content/public/browser/navigation_ui_data.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/common/referrer.h"
 #include "content/public/common/url_constants.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/base/load_flags.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_request_context.h"
 
 namespace content {
 
 namespace {
 
 // Request ID for browser initiated requests. We start at -2 on the same lines
 // as ResourceDispatcherHostImpl.
 int g_next_request_id = -2;
 
 WebContents* GetWebContentsFromFrameTreeNodeID(int frame_tree_node_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   FrameTreeNode* frame_tree_node =
       FrameTreeNode::GloballyFindByID(frame_tree_node_id);
   if (!frame_tree_node)
     return nullptr;
 
   return WebContentsImpl::FromFrameTreeNode(frame_tree_node);
 }
 
 class AssociatedURLLoaderWrapper final : public mojom::URLLoader {
  public:
-  static void CreateLoaderAndStart(mojom::URLLoaderFactory* factory,
-                                   mojom::URLLoaderRequest request,
-                                   uint32_t options,
-                                   const ResourceRequest& resource_request,
-                                   mojom::URLLoaderClientPtr client) {
+  static void CreateLoaderAndStart(
+      mojom::URLLoaderFactory* factory,
+      mojom::URLLoaderRequest request,
+      uint32_t options,
+      const ResourceRequest& resource_request,
+      mojom::URLLoaderClientPtr client,
+      const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
     mojom::URLLoaderAssociatedPtr associated_ptr;
     mojom::URLLoaderAssociatedRequest associated_request =
         mojo::MakeRequest(&associated_ptr);
-    factory->CreateLoaderAndStart(std::move(associated_request),
-                                  0 /* routing_id */, 0 /* request_id */,
-                                  options, resource_request, std::move(client));
+    factory->CreateLoaderAndStart(
+        std::move(associated_request), 0 /* routing_id */, 0 /* request_id */,
+        options, resource_request, std::move(client), traffic_annotation);
     mojo::MakeStrongBinding(
         base::MakeUnique<AssociatedURLLoaderWrapper>(std::move(associated_ptr)),
         std::move(request));
   }
 
   explicit AssociatedURLLoaderWrapper(
       mojom::URLLoaderAssociatedPtr associated_ptr)
       : associated_ptr_(std::move(associated_ptr)) {}
   ~AssociatedURLLoaderWrapper() override {}
 
@@ skipping 52 matching lines @@
     }
 
     // Requests to WebUI scheme won't get redirected to/from other schemes
     // or be intercepted, so we just let it go here.
     if (factory_for_webui.is_valid()) {
       mojom::URLLoaderFactoryPtr factory_ptr;
       factory_ptr.Bind(std::move(factory_for_webui));
       AssociatedURLLoaderWrapper::CreateLoaderAndStart(
           factory_ptr.get(), std::move(url_loader_request),
           mojom::kURLLoadOptionSendSSLInfo, *resource_request_,
-          std::move(url_loader_client_ptr_));
+          std::move(url_loader_client_ptr_),
+          net::MutableNetworkTrafficAnnotationTag(NO_TRAFFIC_ANNOTATION_YET));
       return;
     }
 
     DCHECK(handlers_.empty());
     if (service_worker_navigation_handle_core) {
       RequestContextFrameType frame_type =
           request_info->is_main_frame ? REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL
                                       : REQUEST_CONTEXT_FRAME_TYPE_NESTED;
 
       storage::BlobStorageContext* blob_storage_context = GetBlobStorageContext(
@@ skipping 47 matching lines @@
     mojom::URLLoaderFactory* factory = nullptr;
     DCHECK_EQ(handlers_.size(), handler_index_);
     if (resource_request_->url.SchemeIs(url::kBlobScheme)) {
       factory = url_loader_factory_getter_->GetBlobFactory()->get();
     } else {
       factory = url_loader_factory_getter_->GetNetworkFactory()->get();
     }
     AssociatedURLLoaderWrapper::CreateLoaderAndStart(
         factory, std::move(url_loader_request_),
         mojom::kURLLoadOptionSendSSLInfo, *resource_request_,
-        std::move(url_loader_client_ptr_));
+        std::move(url_loader_client_ptr_),
+        net::MutableNetworkTrafficAnnotationTag(NO_TRAFFIC_ANNOTATION_YET));
   }
 
  private:
   std::vector<std::unique_ptr<URLLoaderRequestHandler>> handlers_;
   size_t handler_index_ = 0;
 
   std::unique_ptr<ResourceRequest> resource_request_;
   ResourceContext* resource_context_;
 
   scoped_refptr<URLLoaderFactoryGetter> url_loader_factory_getter_;
@@ skipping 166 matching lines @@
     TRACE_EVENT_ASYNC_END2("navigation", "Navigation timeToResponseStarted",
                            this, "&NavigationURLLoaderNetworkService", this,
                            "success", false);
 
     delegate_->OnRequestFailed(completion_status.exists_in_cache,
                                completion_status.error_code);
   }
 }
 
 }  // namespace content