Network traffic annotation added to chrome::BitmapFetcher.

chrome/browser/ui/omnibox/chrome_omnibox_client.cc

 // Copyright 2013 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/ui/omnibox/chrome_omnibox_client.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 30 matching lines @@
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/search_provider.h"
 #include "components/prefs/pref_service.h"
 #include "components/search/search.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"
 
 using predictors::AutocompleteActionPredictor;
 
 namespace {
 
 // Returns the AutocompleteMatch that the InstantController should prefetch, if
 // any.
@@ skipping 221 matching lines @@
   }
 
   const auto match = std::find_if(
       result.begin(), result.end(),
       [](const AutocompleteMatch& current) { return !!current.answer; });
   if (match != result.end()) {
     BitmapFetcherService* image_service =
         BitmapFetcherServiceFactory::GetForBrowserContext(profile_);
     if (image_service) {
       image_service->CancelRequest(request_id_);
+
+      // If you cheange this, please also update annotation:
+      DCHECK(...);

[Ramin Halavati, 2017/02/15 11:52:03]

Can we have a simple check here to ensure that Google owned service is called?

[Justin Donnelly, 2017/02/15 21:39:44]

We have no control over whether and when other Suggest providers start providing
answers with image URLs so a DCHECK strikes me as risky. I'd prefer to change
the destination to WEBSITE to account for the fact that we can't control the
source of the suggestions.

[Ramin Halavati, 2017/02/16 07:03:30]

Done.

+
+      net::NetworkTrafficAnnotationTag traffic_annotation =
+          net::DefineNetworkTrafficAnnotation("omnibox_result_change", R"(
+            semantics {
+              sender: "Omnibox Suggest"
+              description:
+                "The Google Chrome provides answers in the suggestion list to "

[Justin Donnelly, 2017/02/15 21:39:44]

Remove "The".

[Ramin Halavati, 2017/02/16 07:03:30]

Done.

+                "the queries you type in the omnibox. This request retrieves a "
+                "small image (for example, an icon illustrating the current "
+                "weather conditions) when this can add information to the "
+                "answer."
+              trigger:
+                "Change of results for the query typed by the user in the "
+                "omnibox."
+              data:
+                "The only data sent is the path to an image. No user data is "
+                "included, although the general weather condition (sunny, "
+                "rainy, etc.) in the user's current location could be inferred "
+                "from the name of the image in the path."
+              destination: GOOGLE_OWNED_SERVICE
+            }
+            policy {
+              cookies_allowed: false
+              cookies_store: ""
+              setting:
+                "You can enable or disable this feature via 'Use a prediction "
+                "service to help complete searches and URLs typed in the "
+                "address bar.' in Chrome's settings under Advanced. The "
+                "feature is enabled by default."
+              policy {
+                SearchSuggestEnabled {
+                    policy_options {mode: MANDATORY}
+                    value: false
+                }
+              }
+            })");
+
       request_id_ = image_service->RequestImage(
           match->answer->second_line().image_url(),
           new AnswerImageObserver(
               base::Bind(&ChromeOmniboxClient::OnBitmapFetched,
-                         base::Unretained(this), on_bitmap_fetched)));
+                         base::Unretained(this), on_bitmap_fetched)),
+          traffic_annotation);
     }
   }
 }
 
 void ChromeOmniboxClient::OnCurrentMatchChanged(
     const AutocompleteMatch& match) {
   if (!prerender::IsOmniboxEnabled(profile_))
     DoPreconnect(match);
 }
 
@@ skipping 146 matching lines @@
       InstantSearchPrerenderer::GetForProfile(profile_);
   if (prerenderer)
     prerenderer->Prerender(suggestion);
 }
 
 void ChromeOmniboxClient::OnBitmapFetched(const BitmapFetchedCallback& callback,
                                           const SkBitmap& bitmap) {
   request_id_ = BitmapFetcherService::REQUEST_ID_INVALID;
   callback.Run(bitmap);
 }