Network traffic annotation added to image_data_fetcher.

components/ntp_snippets/remote/remote_suggestions_provider_impl.cc

 // Copyright 2015 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_snippets/remote/remote_suggestions_provider_impl.h"
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
@@ skipping 15 matching lines @@
 #include "components/ntp_snippets/category_rankers/category_ranker.h"
 #include "components/ntp_snippets/features.h"
 #include "components/ntp_snippets/pref_names.h"
 #include "components/ntp_snippets/remote/remote_suggestions_database.h"
 #include "components/ntp_snippets/remote/remote_suggestions_scheduler.h"
 #include "components/ntp_snippets/switches.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/variations/variations_associated_data.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 
 namespace ntp_snippets {
 
 namespace {
 
 // Number of suggestions requested to the server. Consider replacing sparse UMA
 // histograms with COUNTS() if this number increases beyond 50.
 const int kMaxSuggestionCount = 10;
@@ skipping 235 matching lines @@
     const ImageFetchedCallback& callback) {
   if (url.is_empty() || !thumbnail_requests_throttler_.DemandQuotaForRequest(
                             /*interactive_request=*/true)) {
     // Return an empty image. Directly, this is never synchronous with the
     // original FetchSuggestionImage() call - an asynchronous database query has
     // happened in the meantime.
     callback.Run(gfx::Image());
     return;
   }
 
+  net::NetworkTrafficAnnotationTag traffic_annotation =

[Marc Treib, 2017/05/09 13:40:36]

I think this one was copied from the wrong place. This instance is quite
different.

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

Acknowledged.

+      net::DefineNetworkTrafficAnnotation("suggestions_service_factory", R"(

[Marc Treib, 2017/05/09 13:40:36]

remote_suggestions_service

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

Done.

+        semantics {
+          sender: "suggestions_service"

[Marc Treib, 2017/05/09 13:40:36]

Content Suggestion thumbnail fetch

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

Done.

+          description:
+            "Retrieves thumbnails for site suggestions based on the user's "
+            "synced browsing history, for use e.g. on the New Tab page."

[Marc Treib, 2017/05/09 13:40:36]

Retrieves thumbnails for content suggestions, for display on the New Tab page or
Chrome Home.

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

Done.

+          trigger:
+            "Triggered when a thumbnail for a suggestion is required, and no "
+            "local thumbnail is available."

[Marc Treib, 2017/05/09 13:40:36]

Triggered when the user looks at a content suggestion (and its thumbnail isn't
cached yet).

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

Done.

+          data: "The URL for which to retrieve a thumbnail."

[Marc Treib, 2017/05/09 13:40:36]

None.

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

Done.

+          destination: GOOGLE_OWNED_SERVICE
+        }
+        policy {
+          cookies_allowed: false
+          setting:
+          "Users can disable this feature by signing out of Chrome, or "

[Marc Treib, 2017/05/09 13:40:36]

Currently not available, but in progress: crbug.com/703684

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

Done.

+          "disabling Sync or History Sync in Chrome settings under 'Advanced "
+          "sync settings...'. The feature is enabled by default."
+        chrome_policy {

[Marc Treib, 2017/05/09 13:40:36]

          chrome_policy {
            NTPContentSuggestionsEnabled {
              policy_options {mode: MANDATORY}
              NTPContentSuggestionsEnabled: false
            }
          }

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

Done.

+            SyncDisabled {
+              policy_options {mode: MANDATORY}
+              SyncDisabled: true
+            }
+          }
+          chrome_policy {
+            SigninAllowed {
+              policy_options {mode: MANDATORY}
+              SigninAllowed: false
+            }
+          }
+        })");
   image_fetcher_->StartOrQueueNetworkRequest(
       suggestion_id.id_within_category(), url,
       base::Bind(&CachedImageFetcher::OnImageDecodingDone,
-                 base::Unretained(this), callback));
+                 base::Unretained(this), callback),
+      traffic_annotation);
 }
 
 RemoteSuggestionsProviderImpl::RemoteSuggestionsProviderImpl(
     Observer* observer,
     PrefService* pref_service,
     const std::string& application_language_code,
     CategoryRanker* category_ranker,
     RemoteSuggestionsScheduler* scheduler,
     std::unique_ptr<RemoteSuggestionsFetcher> suggestions_fetcher,
     std::unique_ptr<image_fetcher::ImageFetcher> image_fetcher,
@@ skipping 1043 matching lines @@
 RemoteSuggestionsProviderImpl::CategoryContent::CategoryContent(
     CategoryContent&&) = default;
 
 RemoteSuggestionsProviderImpl::CategoryContent::~CategoryContent() = default;
 
 RemoteSuggestionsProviderImpl::CategoryContent&
 RemoteSuggestionsProviderImpl::CategoryContent::operator=(CategoryContent&&) =
     default;
 
 }  // namespace ntp_snippets