Network traffic annotation added to logo_tracker.

components/search_provider_logos/logo_tracker.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 "components/search_provider_logos/logo_tracker.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/default_clock.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/search_provider_logos/switches.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"
 
 namespace search_provider_logos {
 
 namespace {
 
 const int64_t kMaxDownloadBytes = 1024 * 1024;
 
@@ skipping 189 matching lines @@
   }
   GURL url;
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kGoogleDoodleUrl)) {
     url = GURL(command_line->GetSwitchValueASCII(switches::kGoogleDoodleUrl));
   } else {
     url = append_queryparams_func_.Run(
         logo_url_, fingerprint, wants_cta_, transparent_);
   }
 
-  fetcher_ = net::URLFetcher::Create(url, net::URLFetcher::GET, this);
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("logo_tracker", R"(
+        semantics {
+          sender: "Logo Tracker"
+          description:
+            "Provides the logo image for a search provider (e.g. Google or "
+            "Yahoo!)."
+          trigger: "Displaying the new tab page on iOS or Android."
+          data: "Link to logo image and metadata."

[Marc Treib, 2017/02/27 09:52:59]

Wait, if I interpret the proto description correctly, then this should describe
what Chrome *sends*, right?
The logo image and metadata are *received* by Chrome; I don't think we send
anything noteworthy.
Sorry for the back and forth!

[Ramin Halavati, 2017/02/27 10:04:30]

Yes, this is what Chrome sends, so is the current annotation for |data| correct
or you'd like it rephrased?

[Marc Treib, 2017/02/27 10:12:47]

The current formulation refers to what Chrome receives, so it needs to be
changed.

As far as I can tell, the only thing Chrome sends (apart from cookies, which are
probably not even required) is a "fingerprint" for the logo that we currently
have cached. Note that this isn't user-specific, it just identifies the image.

[Ramin Halavati, 2017/02/27 10:16:54]

Done, in case cookies are not required, I can create a CL that disables them and
base this one on that.

[Marc Treib, 2017/02/27 10:23:02]

The problem is, I'm not sure how we could properly test this. Justin is OOO, and
I don't want to make that call by myself.
How about just adding a TODO for now?

[justincohen, 2017/02/27 14:20:10]

I see, 'send' is just metadata in this case.  What do you mean 'disables them
and base this one on that' ?

+          destination: OTHER
+        }
+        policy {
+          cookies_allowed: true
+          cookies_store: "user"
+          setting:
+            "Choosing a non-Google search engine in Chromium settings under "
+            "'Search Engine' will disable this feature."
+          policy_exception_justification:
+            "Not implemented, considered not useful as it does not upload any"
+            "data and just downloads a logo image."
+        })");
+  fetcher_ = net::URLFetcher::Create(url, net::URLFetcher::GET, this,
+                                     traffic_annotation);
   fetcher_->SetRequestContext(request_context_getter_.get());
   data_use_measurement::DataUseUserData::AttachToFetcher(
       fetcher_.get(),
       data_use_measurement::DataUseUserData::SEARCH_PROVIDER_LOGOS);
   fetcher_->Start();
   logo_download_start_time_ = base::TimeTicks::Now();
 }
 
 void LogoTracker::OnFreshLogoParsed(bool* parsing_failed,
                                     std::unique_ptr<EncodedLogo> logo) {
@@ skipping 108 matching lines @@
                                              int64_t current,
                                              int64_t total,
                                              int64_t current_network_bytes) {
   if (total > kMaxDownloadBytes || current > kMaxDownloadBytes) {
     LOG(WARNING) << "Search provider logo exceeded download size limit";
     ReturnToIdle(DOWNLOAD_OUTCOME_DOWNLOAD_FAILED);
   }
 }
 
 }  // namespace search_provider_logos