Network traffic annotation added to chrome::BitmapFetcher.

chrome/browser/ui/omnibox/chrome_omnibox_client.cc

Index: chrome/browser/ui/omnibox/chrome_omnibox_client.cc
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
index 3e12199b9ce6e01a39cd809637a45215c28636ef..f9e22ed7d033385d55709dff911bc3f9411dadd4 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
@@ -48,6 +48,7 @@
 #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"
@@ -289,11 +290,32 @@ void ChromeOmniboxClient::OnResultChanged(
         BitmapFetcherServiceFactory::GetForBrowserContext(profile_);
     if (image_service) {
       image_service->CancelRequest(request_id_);
+      net::NetworkTrafficAnnotationTag traffic_annotation =
+          net::DefineNetworkTrafficAnnotation("", R"(
+            semantics {
+              sender: ""

[Justin Donnelly, 2017/02/14 17:01:05]

suggest (Alternatively, "omnibox" if a more general description is preferred.
This is the suggest feature of the omnibox component.)

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

Done.

+              description: ""

[Justin Donnelly, 2017/02/14 17:01:05]

Google Chrome provides answers in the suggestion list to 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.

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

Done.

+              trigger: ""

[Justin Donnelly, 2017/02/14 17:01:05]

Query typed by the user in the omnibox.

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

Done.

+              data: ""

[Justin Donnelly, 2017/02/14 17:01:05]

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.

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

Done.

+              destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER

[Justin Donnelly, 2017/02/14 17:01:05]

Yeah, this is a tough one. Currently, no search engine other than Google
provides answers in the suggest feature, though they could do so at any time.
Moreover, even the answers provided by Google could point to images on other web
sites (this request is for the image, not the suggestions themselves). On the
other hand, this feature is almost always set to have Google as the backend and
is perceived by the user to be part of the browser.

In the balance, I'd choose WEBSITE based on what is possible here. But
GOOGLE_OWNED_SERVICE would also be reasonable given the current behavior and how
users probably perceive it.

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

Can we add a DCHECK to insure that Google owned service is used here and if it
changes in future, the one who changes it changes the annotation as well?

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

Response in other comment.

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

Done.

+            }
+            policy {
+              cookies_allowed: false/true

[Justin Donnelly, 2017/02/14 17:01:05]

false (requests are to ssl.gstatic.com)

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

I wonder as the default URLFetcher allows to send and store and this is not
specified anywhere, should this be false or true?

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

Yeah, if the annotation is meant to be a description of what's possible (rather
than a policy that will be enforced) then you're right, true is more accurate.
We (Chrome) don't even control the source of the Google URLs (they come from the
Suggest team's backends).

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

Done.

+              cookies_store: ""
+              setting: ""

[Justin Donnelly, 2017/02/14 17:01:05]

Disable ‘Use a prediction service to help complete searches and URLs typed in
the address bar' in Chrome’s settings under Advanced.

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

Done.

+              policy {
+                [POLICY_NAME] {

[Justin Donnelly, 2017/02/14 17:01:05]

SearchSuggestEnabled

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

Done.

+                    policy_options {mode: MANDATORY/RECOMMENDED/UNSET}

[Justin Donnelly, 2017/02/14 17:01:05]

I'm honestly not sure.

I see that there's a CloudPolicySettings entry called SearchSuggestEnabled but I
don't know how that interacts with the user setting
(prefs::kSearchSuggestEnabled). You can see where we consult this pref in
IsSuggestEnabled* but there's no explicit check that I can find for the policy.
Does the cloud policy just override the user pref somehow?

*
https://cs.chromium.org/chromium/src/chrome/browser/search/search.cc?type=cs&...

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

It seems that selecting false value for this will disable it and prevent user
from changing it:

http://dev.chromium.org/administrators/policy-list-3#SearchSuggestEnabled

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

Cool, thanks for the reference, that's helpful.

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

Done.

+                    value: ...
+                }
+              }
+            })");
       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);
     }
   }
 }