Network traffic annotation added to image_data_fetcher.

chrome/browser/search/suggestions/suggestions_service_factory.cc

 // Copyright 2014 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 "chrome/browser/search/suggestions/suggestions_service_factory.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 14 matching lines @@
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/suggestions/blacklist_store.h"
 #include "components/suggestions/image_manager.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "components/suggestions/suggestions_service_impl.h"
 #include "components/suggestions/suggestions_store.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 
 using content::BrowserThread;
 using image_fetcher::ImageFetcherImpl;
 
 namespace suggestions {
 
 // static
 SuggestionsService* SuggestionsServiceFactory::GetForProfile(Profile* profile) {
   return static_cast<SuggestionsService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
@@ skipping 34 matching lines @@
       new SuggestionsStore(profile->GetPrefs()));
   std::unique_ptr<BlacklistStore> blacklist_store(
       new BlacklistStore(profile->GetPrefs()));
 
   std::unique_ptr<leveldb_proto::ProtoDatabaseImpl<ImageData>> db(
       new leveldb_proto::ProtoDatabaseImpl<ImageData>(background_task_runner));
 
   base::FilePath database_dir(
       profile->GetPath().Append(FILE_PATH_LITERAL("Thumbnails")));
 
+  net::NetworkTrafficAnnotationTag traffic_annotation =

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

image_manager_traffic_annotation (otherwise it's easy to mistake it for the
"main" annotation for the SuggestionsService)

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

Done.

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

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

suggestions_service

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

Done.

+        semantics {
+          sender: "..."

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

SuggestionsService

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

Done.

+          description: "..."

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

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

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

Done.

+          trigger: "..."

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

Triggered when a thumbnail for a suggestion is required, and no local thumbnail
is available.

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

Done.

+          data: "..."

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

None.

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

Shouldn't it sent links to required thumbnails? And aren't they based on user
history?

+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER/LOCAL

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

GOOGLE_OWNED_SERVICE

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

Done.

+        }
+        policy {
+          cookies_allowed: false/true

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

false

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

Done.

+          cookies_store: "..."
+          setting: "..."

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

This cannot be disabled individually, but users can disable the whole
SuggestionsService, see here:
https://cs.chromium.org/chromium/src/components/suggestions/suggestions_servi...

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

Done.

+          chrome_policy {
+            [POLICY_NAME] {
+              policy_options {mode: MANDATORY/RECOMMENDED/UNSET}
+              [POLICY_NAME]: ... //(value to disable it)
+            }
+          }
+          policy_exception_justification: "..."
+        })");
   std::unique_ptr<ImageFetcherImpl> image_fetcher(
-      new ImageFetcherImpl(
-          base::MakeUnique<suggestions::ImageDecoderImpl>(),
-          profile->GetRequestContext()));
+      new ImageFetcherImpl(base::MakeUnique<suggestions::ImageDecoderImpl>(),
+                           profile->GetRequestContext(), traffic_annotation));
   std::unique_ptr<ImageManager> thumbnail_manager(new ImageManager(
       std::move(image_fetcher), std::move(db), database_dir,
       BrowserThread::GetTaskRunnerForThread(BrowserThread::DB)));
   return new SuggestionsServiceImpl(
       signin_manager, token_service, sync_service, profile->GetRequestContext(),
       std::move(suggestions_store), std::move(thumbnail_manager),
       std::move(blacklist_store));
 }
 
 void SuggestionsServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   SuggestionsServiceImpl::RegisterProfilePrefs(registry);
 }
 
 }  // namespace suggestions