Network traffic annotation added to image_data_fetcher.

components/image_fetcher/core/image_data_fetcher.h

Index: components/image_fetcher/core/image_data_fetcher.h
diff --git a/components/image_fetcher/core/image_data_fetcher.h b/components/image_fetcher/core/image_data_fetcher.h
index 169ad54d2ce6bfe7fa004aa7a289ed454a7c85e5..2dea1c41a3a7eae76b0d5115263da4a053917c91 100644
--- a/components/image_fetcher/core/image_data_fetcher.h
+++ b/components/image_fetcher/core/image_data_fetcher.h
@@ -15,6 +15,7 @@
 #include "base/optional.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/image_fetcher/core/request_metadata.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
@@ -39,7 +40,8 @@ class ImageDataFetcher : public net::URLFetcherDelegate {
   using DataUseServiceName = data_use_measurement::DataUseUserData::ServiceName;
 
   explicit ImageDataFetcher(
-      net::URLRequestContextGetter* url_request_context_getter);
+      net::URLRequestContextGetter* url_request_context_getter,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation);
   ~ImageDataFetcher() override;
 
   // Sets a service name against which to track data usage.
@@ -93,6 +95,8 @@ class ImageDataFetcher : public net::URLFetcherDelegate {
   // Upper limit for the number of bytes to download per image.
   base::Optional<int64_t> max_download_bytes_;
 
+  const net::NetworkTrafficAnnotationTag& traffic_annotation_;

[Marc Treib, 2017/05/09 09:43:47]

This should probably not be a reference, but an instance. Otherwise it'll break
if whoever created the fetcher doesn't hold on to the annotation object it
created (which I think is most cases).

[Ramin Halavati, 2017/05/09 11:08:24]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(ImageDataFetcher);
 };