Add traffic annotation to GCM Connection Factory.

Network traffic annotation is added to:
google_apis/gcm/engine/connection_factory_impl.cc

Bug: 656607
Change-Id: Ibc0d1cc04607b67100d9922c27b867db2761c633
Reviewed-on: https://chromium-review.googlesource.com/916001
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537254}

google_apis/gcm/engine/connection_factory_impl.cc

@@ -344,8 +344,43 @@ void ConnectionFactoryImpl::InitHandler() {
     event_tracker_.WriteToLoginRequest(&login_request);
   }
 
-  // TODO(crbug.com/656607): Add Proper annotation
-  connection_handler_->Init(login_request, NO_TRAFFIC_ANNOTATION_BUG_656607,
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("gcm_connection_factory", R"(
+        semantics {
+          sender: "GCM Connection Factory"
+          description:
+            "TCP connection to the Google Cloud Messaging notification "
+            "servers. Supports reliable bi-directional messaging and push "
+            "notifications for multiple consumers."
+          trigger:
+            "The connection is created when an application (e.g. Chrome Sync) "
+            "or a website using Web Push starts the GCM service, and is kept "
+            "alive as long as there are valid applications registered. "
+            "Messaging is application/website controlled."
+          data:
+            "Arbitrary application-specific data."
+          destination: GOOGLE_OWNED_SERVICE
+        }
+        policy {
+          cookies_allowed: NO
+          setting:
+            "Users can stop messages related to Sync by disabling Sync for "
+            "everything in settings. Messages related to Web Push can be "
+            "stopped by revoking the site permissions in settings. Messages "
+            "related to extensions can be stopped by uninstalling the "
+            "extension."
+          chrome_policy {
+            SyncDisabled {
+              SyncDisabled: True
+            }
+          }
+        }
+        comments:
+          "'SyncDisabled' policy disables messages that are based on Sync, "
+          "but does not have any effect on other Google Cloud messages."
+        )");
+
+  connection_handler_->Init(login_request, traffic_annotation,
                             socket_handle_.socket());
 }
 

tools/metrics/histograms/enums.xml

@@ -43761,6 +43761,7 @@ Called by update_traffic_annotation_histograms.py.-->
   <int value="27071967" label="chrome_cleaner"/>
   <int value="27915688" label="oauth2_access_token_fetcher"/>
   <int value="28406789" label="undefined-656607"/>
+  <int value="29057242" label="gcm_connection_factory"/>
   <int value="29188932" label="oauth2_api_call_flow"/>
   <int value="29865866" label="headless_url_request"/>
   <int value="30913825" label="family_info"/>

tools/traffic_annotation/summary/annotations.xml

@@ -108,6 +108,7 @@ Refer to README.md for content description and update process.
  <item id="gaia_oauth_client_refresh_token" hash_code="82462683" type="0" content_hash_code="22305252" os_list="linux,windows" file_path="google_apis/gaia/gaia_oauth_client.cc"/>
  <item id="gcm_channel_status_request" hash_code="18300705" type="0" content_hash_code="53862393" os_list="linux,windows" file_path="components/gcm_driver/gcm_channel_status_request.cc"/>
  <item id="gcm_checkin" hash_code="65957842" type="0" content_hash_code="98259579" os_list="linux,windows" file_path="google_apis/gcm/engine/checkin_request.cc"/>
+ <item id="gcm_connection_factory" hash_code="29057242" type="0" content_hash_code="75279835" os_list="linux,windows" file_path="google_apis/gcm/engine/connection_factory_impl.cc"/>
  <item id="gcm_registration" hash_code="61656965" type="0" content_hash_code="113670632" os_list="linux,windows" file_path="google_apis/gcm/engine/registration_request.cc"/>
  <item id="gcm_subscription" hash_code="56434025" type="0" content_hash_code="61632174" os_list="linux,windows" file_path="components/ntp_snippets/breaking_news/subscription_json_request.cc"/>
  <item id="gcm_unregistration" hash_code="119542033" type="0" content_hash_code="30144127" os_list="linux,windows" file_path="google_apis/gcm/engine/unregistration_request.cc"/>