Network traffic annotation added to chrome::BitmapFetcher.

chrome/browser/autocomplete/chrome_autocomplete_provider_client.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/autocomplete/chrome_autocomplete_provider_client.h"
 
 #include <stddef.h>
 
 #include "base/feature_list.h"
 #include "base/macros.h"
@@ skipping 16 matching lines @@
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/prefs/pref_service.h"
 #include "components/sync/driver/sync_service_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/features/features.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/autocomplete/keyword_extensions_delegate_impl.h"
 #endif
 
 #if !defined(OS_ANDROID)
 namespace {
 
 // This list should be kept in sync with chrome/common/url_constants.h.
 // Only include useful sub-pages, confirmation alerts are not useful.
@@ skipping 195 matching lines @@
 void ChromeAutocompleteProviderClient::DeleteMatchingURLsForKeywordFromHistory(
     history::KeywordID keyword_id,
     const base::string16& term) {
   GetHistoryService()->DeleteMatchingURLsForKeyword(keyword_id, term);
 }
 
 void ChromeAutocompleteProviderClient::PrefetchImage(const GURL& url) {
   BitmapFetcherService* image_service =
       BitmapFetcherServiceFactory::GetForBrowserContext(profile_);
   DCHECK(image_service);
-  image_service->Prefetch(url);
+
+  // TODO(jdonnelly, rhalavati): Create a helper function with Callback to
+  // create annotation and pass it to image_service, merging this annotation and
+  // chrome/browser/ui/omnibox/chrome_omnibox_client.cc
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("omnibox_prefetch_image", R"(
+        semantics {
+          sender: "Omnibox Suggest Prefetch"

[Peter Kasting, 2017/02/24 02:38:22]

I wonder if this is too fine-grained.

Over in https://codereview.chromium.org/2709543002 I'm about to propose a sender
of "omnibox" for another annotation.  I think that's the right level of
granularity here too.

[Ramin Halavati, 2017/02/24 07:44:01]

We need to have different |sender| texts for different annotations. So I think
if it's OK, lets keep both more granular so that they refer more precisely to
the part of code that is making the request.

battre@:
Any comments?

[battre, 2017/02/24 07:54:23]

Actually, I would prefer if the same component reuses the same |sender| text. I
was envisioning this as a grouping function.

+          description:
+            "Google Chrome provides answers in the suggestion list for certain "

[Peter Kasting, 2017/02/24 02:41:18]

(Sorry for all the separate mails on this stuff)

Is it really appropriate to say "Google Chrome" (or even "Chrome") in these
annotations, when this code can be used in Chromium or third-party products?

What about this first sentence: "The omnibox suggestion list can contain direct
answers to certain user queries."

+            "queries that user types in the omnibox. This request retrieves a "
+            "small image (for example, an icon illustrating the current "
+            "weather conditions) when this can add information to an 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 some might be inferrable (e.g. whether the "
+            "weather is sunny or rainy in the user's current location) from "
+            "the name of the image in the path."
+          destination: WEBSITE
+        }
+        policy {
+          cookies_allowed: true
+          cookies_store: "user"
+          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 "

[Peter Kasting, 2017/02/24 02:41:18]

...similarly here "...in the settings page..."

+            "feature is enabled by default."
+          policy {
+            SearchSuggestEnabled {
+                policy_options {mode: MANDATORY}
+                value: false
+            }
+          }
+        })");
+
+  image_service->Prefetch(url, traffic_annotation);
 }
 
 void ChromeAutocompleteProviderClient::OnAutocompleteControllerResultReady(
     AutocompleteController* controller) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
       content::Source<AutocompleteController>(controller),
       content::NotificationService::NoDetails());
 }