Network traffic annotation added to URLLoaderImpl.

content/browser/appcache/appcache_url_loader_factory.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/appcache/appcache_url_loader_factory.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "content/browser/appcache/appcache_entry.h"
 #include "content/browser/appcache/appcache_policy.h"
 #include "content/browser/appcache/appcache_request.h"
 #include "content/browser/appcache/appcache_storage.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/url_loader_factory_getter.h"
 #include "content/common/network_service.mojom.h"
 #include "content/common/resource_request.h"
 #include "content/common/url_loader.mojom.h"
 #include "content/common/url_loader_factory.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 
 namespace content {
 
 namespace {
 
 // Handles AppCache URL loads for the network service.
 class AppCacheURLLoader : public AppCacheStorage::Delegate,
                           public mojom::URLLoader {
  public:
   AppCacheURLLoader(const ResourceRequest& request,
                     mojom::URLLoaderAssociatedRequest url_loader_request,
                     int32_t routing_id,
                     int32_t request_id,
                     mojom::URLLoaderClientPtr client_info,
                     ChromeAppCacheService* appcache_service,
-                    URLLoaderFactoryGetter* factory_getter)
+                    URLLoaderFactoryGetter* factory_getter,
+                    const net::NetworkTrafficAnnotationTag& traffic_annotation)
       : request_(request),
         routing_id_(routing_id),
         request_id_(request_id),
         client_info_(std::move(client_info)),
         appcache_service_(appcache_service),
         factory_getter_(factory_getter),
-        binding_(this, std::move(url_loader_request)) {
+        binding_(this, std::move(url_loader_request)),
+        traffic_annotation_(traffic_annotation) {
     binding_.set_connection_error_handler(base::Bind(
         &AppCacheURLLoader::OnConnectionError, base::Unretained(this)));
   }
 
   ~AppCacheURLLoader() override {}
 
   void Start() {
     // If the origin does not exist in the AppCache usage map, then we can
     // safely call the network service here.
     if (appcache_service_->storage()->usage_map()->find(
             request_.url.GetOrigin()) ==
         appcache_service_->storage()->usage_map()->end()) {
       factory_getter_->GetNetworkFactory()->get()->CreateLoaderAndStart(
           mojo::MakeRequest(&network_loader_request_), routing_id_, request_id_,
-          mojom::kURLLoadOptionSendSSLInfo, request_, std::move(client_info_));
+          mojom::kURLLoadOptionSendSSLInfo, request_, std::move(client_info_),
+          net::MutableNetworkTrafficAnnotationTag(traffic_annotation_));
       return;
     }
 
     appcache_service_->storage()->FindResponseForMainRequest(request_.url,
                                                              GURL(), this);
   }
 
   // mojom::URLLoader implementation:
   void FollowRedirect() override { network_loader_request_->FollowRedirect(); }
 
@@ skipping 14 matching lines @@
     AppCachePolicy* policy = appcache_service_->appcache_policy();
     bool was_blocked_by_policy =
         !manifest_url.is_empty() && policy &&
         !policy->CanLoadAppCache(manifest_url,
                                  request_.first_party_for_cookies);
 
     if (was_blocked_by_policy || !entry.has_response_id() ||
         cache_id == kAppCacheNoCacheId) {
       factory_getter_->GetNetworkFactory()->get()->CreateLoaderAndStart(
           mojo::MakeRequest(&network_loader_request_), routing_id_, request_id_,
-          mojom::kURLLoadOptionSendSSLInfo, request_, std::move(client_info_));
+          mojom::kURLLoadOptionSendSSLInfo, request_, std::move(client_info_),
+          net::MutableNetworkTrafficAnnotationTag(NO_TRAFFIC_ANNOTATION_YET));

[jochen (gone - plz use gerrit), 2017/06/08 17:00:58]

why is this not using traffic_annotation_?

[Ramin Halavati, 2017/06/09 07:08:53]

Done.

     } else {
       DLOG(WARNING) << "AppCache found for url " << url
                     << " Returning AppCache factory\n";
       // TODO(ananta)
       // Provide the plumbing to initiate AppCache requests here.
       factory_getter_->GetNetworkFactory()->get()->CreateLoaderAndStart(
           mojo::MakeRequest(&network_loader_request_), routing_id_, request_id_,
-          mojom::kURLLoadOptionSendSSLInfo, request_, std::move(client_info_));
+          mojom::kURLLoadOptionSendSSLInfo, request_, std::move(client_info_),
+          net::MutableNetworkTrafficAnnotationTag(NO_TRAFFIC_ANNOTATION_YET));
     }
   }
 
   void OnConnectionError() { delete this; }
 
   // The current request.
   ResourceRequest request_;
 
   // URLLoader proxy for the network service.
   mojom::URLLoaderAssociatedPtr network_loader_request_;
@@ skipping 13 matching lines @@
   /// AppCache.
   scoped_refptr<ChromeAppCacheService> appcache_service_;
 
   // Used to retrieve the network service factory to pass requests to the
   // network service.
   scoped_refptr<URLLoaderFactoryGetter> factory_getter_;
 
   // Binds the URLLoaderClient with us.
   mojo::AssociatedBinding<mojom::URLLoader> binding_;
 
+  const net::NetworkTrafficAnnotationTag traffic_annotation_;
+
   DISALLOW_COPY_AND_ASSIGN(AppCacheURLLoader);
 };
 
 }  // namespace
 
 // Implements the URLLoaderFactory mojom for AppCache requests.
 AppCacheURLLoaderFactory::AppCacheURLLoaderFactory(
     ChromeAppCacheService* appcache_service,
     URLLoaderFactoryGetter* factory_getter)
     : appcache_service_(appcache_service), factory_getter_(factory_getter) {}
@@ skipping 11 matching lines @@
   raw_factory->loader_factory_bindings_.AddBinding(std::move(factory_instance),
                                                    std::move(request));
 }
 
 void AppCacheURLLoaderFactory::CreateLoaderAndStart(
     mojom::URLLoaderAssociatedRequest url_loader_request,
     int32_t routing_id,
     int32_t request_id,
     uint32_t options,
     const ResourceRequest& request,
-    mojom::URLLoaderClientPtr client) {
+    mojom::URLLoaderClientPtr client,
+    const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // This will get deleted when the connection is dropped by the client.
   AppCacheURLLoader* loader = new AppCacheURLLoader(
       request, std::move(url_loader_request), routing_id, request_id,
-      std::move(client), appcache_service_.get(), factory_getter_.get());
+      std::move(client), appcache_service_.get(), factory_getter_.get(),
+      static_cast<net::NetworkTrafficAnnotationTag>(traffic_annotation));
   loader->Start();
 }
 
 void AppCacheURLLoaderFactory::SyncLoad(int32_t routing_id,
                                         int32_t request_id,
                                         const ResourceRequest& request,
                                         SyncLoadCallback callback) {
   NOTREACHED();
 }
 
 }  // namespace content