Network traffic annotation added to image_data_fetcher.

components/image_fetcher/core/image_data_fetcher.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/image_fetcher/core/image_data_fetcher.h"
 
 #include <utility>
 
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
 
 using data_use_measurement::DataUseUserData;
 
 namespace image_fetcher {
 
 // An active image URL fetcher request. The struct contains the related requests
@@ skipping 36 matching lines @@
   FetchImageData(
       image_url, callback, /*referrer=*/std::string(),
       net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE);
 }
 
 void ImageDataFetcher::FetchImageData(
     const GURL& image_url,
     const ImageDataFetcherCallback& callback,
     const std::string& referrer,
     net::URLRequest::ReferrerPolicy referrer_policy) {
-  std::unique_ptr<net::URLFetcher> url_fetcher = net::URLFetcher::Create(
-      next_url_fetcher_id_++, image_url, net::URLFetcher::GET, this);
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("...", R"(
+        semantics {
+          sender: "..."

[markusheintz_, 2017/05/03 09:04:07]

Is there a description of the fields?

E.g. sender The image_data_fetcher is a utility that can be used by many
different features in Chrome. So what should I put into this field?

+          description: "..."
+          trigger: "..."

[markusheintz_, 2017/05/03 09:04:07]

What do you expect here? This list of trigger is dynamic and may change over
time.

+          data: "..."

[markusheintz_, 2017/05/03 09:04:07]

raw image data is fetch for a given URL

+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER

[markusheintz_, 2017/05/03 09:04:07]

It could be all of the options. Not sure how client will use it.

+        }
+        policy {
+          cookies_allowed: false/true

[markusheintz_, 2017/05/03 09:04:07]

false.

+          cookies_store: "..."

[markusheintz_, 2017/05/03 09:04:07]

NA

+          setting: "..."

[markusheintz_, 2017/05/03 09:04:07]

none. clients have to do the right thing

+          chrome_policy {

[markusheintz_, 2017/05/03 09:04:07]

There exists no policy. It the responsibility of the client to add a policy.
What shall I put here in this case?

+            [POLICY_NAME] {
+              policy_options {mode: MANDATORY/RECOMMENDED/UNSET}
+              [POLICY_NAME]: ... //(value to disable it)
+            }
+          }
+          policy_exception_justification: "..."
+        })");
+  std::unique_ptr<net::URLFetcher> url_fetcher =
+      net::URLFetcher::Create(next_url_fetcher_id_++, image_url,
+                              net::URLFetcher::GET, this, traffic_annotation);
 
   DataUseUserData::AttachToFetcher(url_fetcher.get(), data_use_service_name_);
 
   std::unique_ptr<ImageDataFetcherRequest> request(
       new ImageDataFetcherRequest(callback, std::move(url_fetcher)));
   request->url_fetcher->SetRequestContext(url_request_context_getter_.get());
   request->url_fetcher->SetReferrer(referrer);
   request->url_fetcher->SetReferrerPolicy(referrer_policy);
   request->url_fetcher->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                      net::LOAD_DO_NOT_SAVE_COOKIES |
@@ skipping 45 matching lines @@
 void ImageDataFetcher::FinishRequest(const net::URLFetcher* source,
                                      const RequestMetadata& metadata,
                                      const std::string& image_data) {
   auto request_iter = pending_requests_.find(source);
   DCHECK(request_iter != pending_requests_.end());
   request_iter->second->callback.Run(image_data, metadata);
   pending_requests_.erase(request_iter);
 }
 
 }  // namespace image_fetcher