Network traffic annotation added to image_data_fetcher.

components/doodle/doodle_service.cc

 // Copyright 2017 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/doodle/doodle_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/values.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/doodle/pref_names.h"
 #include "components/image_fetcher/core/image_fetcher.h"
 #include "components/image_fetcher/core/request_metadata.h"
 #include "components/prefs/pref_registry.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "ui/gfx/image/image.h"
 
 namespace doodle {
 
 namespace {
 
 // The maximum time-to-live we'll accept; any larger values will be clamped to
 // this one. This is a last resort in case the server sends bad data.
 const int64_t kMaxTimeToLiveSecs = 30 * 24 * 60 * 60;  // 30 days
 
@@ skipping 69 matching lines @@
     callback.Run(gfx::Image());
     return;
   }
 
   // If there is a CTA image, that means the main image is animated. Show the
   // non-animated CTA image first, and load the animated one only when the
   // user requests it.
   bool has_cta = cached_config_->large_cta_image.has_value();
   const GURL& image_url = has_cta ? cached_config_->large_cta_image->url
                                   : cached_config_->large_image.url;
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("doodle_service", R"(
+        semantics {
+          sender: "Doodle Service"
+          description:
+            "Downloads the Doodle image if Google is the configured search "
+            "provider."
+          trigger: "Displaying the new tab page on Android."
+          data: "None."
+          destination: GOOGLE_OWNED_SERVICE
+        }
+        policy {
+          cookies_allowed: false
+          setting:
+            "Choosing a non-Google search engine in Chromium settings under "
+            "'Search Engine' disables this feature."
+          policy_exception_justification:
+            "Not implemented, considered not useful as it does not upload any "

[msramek, 2017/05/19 08:47:38]

Wouldn't this be
https://www.chromium.org/administrators/policy-list-3#DefaultSearchProviderEn...
?

[Ramin Halavati, 2017/05/19 09:03:37]

Sorry, missed again.

[Marc Treib, 2017/05/19 09:19:24]

Yep, sounds like this policy would do the trick (if you force the default search
engine to be non-Google).
The same then also applies to a few other annotation, like in
doodle_fetcher_impl.cc.

+            "data and just downloads a logo image."
+        })");
   image_fetcher_->StartOrQueueNetworkRequest(
       image_url.spec(), image_url,
       base::Bind(&DoodleService::ImageFetched, base::Unretained(this),
-                 callback));
+                 callback),
+      traffic_annotation);
 }
 
 void DoodleService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void DoodleService::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ skipping 180 matching lines @@
     // TODO(treib): Rename this to "Doodle.*" after we've decided what to do
     // about crbug.com/719513.
     UMA_HISTOGRAM_BOOLEAN("NewTabPage.LogoImageDownloaded",
                           metadata.from_http_cache);
   }
 
   callback.Run(image);
 }
 
 }  // namespace doodle