Network traffic annotation added to gaia_cookie_manager_service.

components/signin/core/browser/gaia_cookie_manager_service.cc

Index: components/signin/core/browser/gaia_cookie_manager_service.cc
diff --git a/components/signin/core/browser/gaia_cookie_manager_service.cc b/components/signin/core/browser/gaia_cookie_manager_service.cc
index a3aa65fe8ee2c95e6fe3d8ab3455e108b0d0a89c..60d237efb28ae19c6d241ab912a2144e9bbe702b 100644
--- a/components/signin/core/browser/gaia_cookie_manager_service.cc
+++ b/components/signin/core/browser/gaia_cookie_manager_service.cc
@@ -25,6 +25,7 @@
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/base/load_flags.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_fetcher_delegate.h"
 
@@ -213,8 +214,33 @@ void GaiaCookieManagerService::ExternalCcResultFetcher::
 std::unique_ptr<net::URLFetcher>
 GaiaCookieManagerService::ExternalCcResultFetcher::CreateFetcher(
     const GURL& url) {
-  std::unique_ptr<net::URLFetcher> fetcher =
-      net::URLFetcher::Create(0, url, net::URLFetcher::GET, this);
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation(
+          "gaia_cookie_manager_external_cc_result", R"(
+          semantics {
+            sender: "Gaia Cookie Manager"
+            description:
+              "This request is used by the GaiaCookieManager when adding an "
+              "account to the Gaia cookies to check the server connection "

[msramek, 2017/05/03 16:22:34]

I'm not sure "Gaia" is understandable to an external reader. Could we just say
Chrome/Google sign-in cookies or something such?

[msarda, 2017/05/09 08:35:42]

We already use GAIA/Gaia in a lot of places in Chrome:
https://cs.chromium.org/search/?q=Gaia+package:%5Echromium$&type=cs

[msramek, 2017/05/09 09:09:45]

Right, but we don't use it in HC articles or the privacy whitepaper. This text
is to be read by enterprise admins configuring Chrome.

I think it's fine to say "used by GaiaCookieManager" because, well, that's just
how the class is called. But when we're explaining what it does, we should use
terms that the reader will know.

[msarda, 2017/05/09 09:17:31]

I did not know this will be used in "HC" articles or privacy whitepaper. In that
case I agree we would need to be more careful about this text.
Ramin: Is that so? Where will this text be used?

Gaia is the Google authentication server. So I would change it to something like
"Google authentication cookies".

[Ramin Halavati, 2017/05/09 09:35:05]

Yes Mihai, as Martin mentioned, this data is also used for enterprise policy
assertions and help on how to set required limitations.

+              "state."

[msramek, 2017/05/03 16:22:34]

Optional: Why do we need to know the server connection state?

[msarda, 2017/05/09 08:35:42]

It looks like this is an optional request that allows Gaia to avoid doing some
server-side checks (see comment above on function
|OnGetCheckConnectionInfoError|). That is all I know unfortunately.

[Ramin Halavati, 2017/05/09 09:35:05]

Acknowledged.

+            trigger:
+              "This is used only once in the first merge session flow by the "
+              "GaiaCookieManager. The value of the first fetch is stored for "
+              "future uses."
+            data: "None."
+            destination: GOOGLE_OWNED_SERVICE
+          }
+          policy {
+            cookies_allowed: false
+            setting: "This feature cannot be disabled in settings."
+            policy_exception_justification:
+              "Not implemented. Disabling GaiaCookieManager would break "
+              "features that depend on it (like account consistency and "
+              "support for child accounts). It makes sense to control top "
+              "level features that use the GaiaCookieManager."
+          })");
+  std::unique_ptr<net::URLFetcher> fetcher = net::URLFetcher::Create(
+      0, url, net::URLFetcher::GET, this, traffic_annotation);
   fetcher->SetRequestContext(helper_->request_context());
   fetcher->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                         net::LOAD_DO_NOT_SAVE_COOKIES);