Network traffic annotation added to image_data_fetcher.

components/ntp_tiles/icon_cacher_impl.cc

 // Copyright 2016 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 "components/ntp_tiles/icon_cacher_impl.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon/core/favicon_util.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/image_fetcher/core/image_decoder.h"
 #include "components/image_fetcher/core/image_fetcher.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 namespace ntp_tiles {
 
 namespace {
 
 constexpr int kDesiredFrameSize = 128;
@@ skipping 45 matching lines @@
     const base::Closure& icon_available,
     const base::Closure& preliminary_icon_available,
     const favicon_base::FaviconImageResult& result) {
   if (!result.image.IsEmpty()) {
     return;
   }
 
   std::unique_ptr<CancelableImageCallback> preliminary_callback =
       MaybeProvideDefaultIcon(site, preliminary_icon_available);
 
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("icon_cacher", R"(
+        semantics {
+          sender: "Popular Sites New Tab Fetch"
+          description:
+            "Chrome may display a list of regionally-popular web sites on the "
+            "New Tab Page. This service fetches icons from those sites."
+          trigger:
+            "Whenever a popular site would be displayed, but its icon is not "
+            "yet cached in the browser."
+          data: "The URL for which to retrieve a thumbnail."

[sfiera, 2017/05/09 13:25:55]

This does not fetch a thumbnail, just an icon.

e.g. it might be a request for https://chromium.org/favicon.ico.

[Ramin Halavati, 2017/05/09 13:57:50]

Done.

+          destination: WEBSITE
+        }
+        policy {
+          cookies_allowed: false
+          setting: "This feature cannot be disabled in settings."
+          policy_exception_justification: "Not implemented."
+        })");
   image_fetcher_->StartOrQueueNetworkRequest(
       std::string(), IconURL(site),
       base::Bind(&IconCacherImpl::OnFaviconDownloaded, base::Unretained(this),
                  site, base::Passed(std::move(preliminary_callback)),
-                 icon_available));
+                 icon_available),
+      traffic_annotation);
 }
 
 void IconCacherImpl::OnFaviconDownloaded(
     PopularSites::Site site,
     std::unique_ptr<CancelableImageCallback> preliminary_callback,
     const base::Closure& icon_available,
     const std::string& id,
     const gfx::Image& fetched_image,
     const image_fetcher::RequestMetadata& metadata) {
   if (fetched_image.IsEmpty()) {
@@ skipping 38 matching lines @@
   image_fetcher_->GetImageDecoder()->DecodeImage(
       ResourceBundle::GetSharedInstance()
           .GetRawDataResource(site.default_icon_resource)
           .as_string(),
       gfx::Size(kDesiredFrameSize, kDesiredFrameSize),
       preliminary_callback->callback());
   return preliminary_callback;
 }
 
 }  // namespace ntp_tiles