Network traffic annotation added to goolge_apis/gcm/engine.

google_apis/gcm/engine/unregistration_request.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 "google_apis/gcm/engine/unregistration_request.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "google_apis/gcm/base/gcm_util.h"
 #include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.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_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 namespace gcm {
 
 namespace {
 
 const char kRequestContentType[] = "application/x-www-form-urlencoded";
 
@@ skipping 89 matching lines @@
       source_to_record_(source_to_record),
       weak_ptr_factory_(this) {
   DCHECK_GE(max_retry_count, 0);
 }
 
 UnregistrationRequest::~UnregistrationRequest() {}
 
 void UnregistrationRequest::Start() {
   DCHECK(!callback_.is_null());
   DCHECK(!url_fetcher_.get());
-
-  url_fetcher_ =
-      net::URLFetcher::Create(registration_url_, net::URLFetcher::POST, this);
+  net::NetworkTrafficAnnotationTag traffic_annotation =

[Peter Beverloo, 2017/03/15 18:58:04]

Proposal (gcm_unregistration):

semantics {
  sender: "GCM Driver"
  description:
      "Google Chrome interacts with Google Cloud Messaging to receive "
      "push messages for various browser features, as well as on behalf "
      "of websites and extensions. This requests Google Cloud Messaging "
      "to invalidate the included registration so that it can no longer "
      "be used to distribute messages to Google Chrome."
  trigger:
      "Immediately after a feature, website or extension removes a "
      "registration they previously created with the GCM Driver."
  data:
      "The profile-bound Android ID and associated secret, and the "
      "identifiers for the feature, website or extension that is "
      "removing the registration."
  destination: GOOGLE_OWNED_SERVICE
}
policy {
  cookies_allowed: false
  setting:
      "Support for interacting with Google Cloud Messaging is enabled by "
      "default, and there is no configuration option to completely "
      "disable it."
  policy_exception_justification:
      "Not implemented, considered not useful."
}

[Ramin Halavati, 2017/03/16 08:43:51]

Done.

+      net::DefineNetworkTrafficAnnotation("...", R"(
+        semantics {
+          sender: "..."
+          description: "..."
+          trigger: "..."
+          data: "..."
+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER
+        }
+        policy {
+          cookies_allowed: false/true
+          cookies_store: "..."
+          setting: "..."
+          policy {
+            [POLICY_NAME] {
+              policy_options {mode: MANDATORY/RECOMMENDED/UNSET}
+              [POLICY_NAME]: ... //(value to disable it)
+            }
+          }
+          policy_exception_justification: "..."
+        })");
+  url_fetcher_ = net::URLFetcher::Create(
+      registration_url_, net::URLFetcher::POST, this, traffic_annotation);
   url_fetcher_->SetRequestContext(request_context_getter_.get());
   url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                              net::LOAD_DO_NOT_SAVE_COOKIES);
 
   std::string extra_headers;
   BuildRequestHeaders(&extra_headers);
   url_fetcher_->SetExtraRequestHeaders(extra_headers);
 
   std::string body;
   BuildRequestBody(&body);
@@ skipping 115 matching lines @@
     // Only REACHED_MAX_RETRIES is reported because the function will skip
     // reporting count and time when status is not SUCCESS.
     DCHECK(custom_request_handler_.get());
     custom_request_handler_->ReportUMAs(status, 0, base::TimeDelta());
   }
 
   callback_.Run(status);
 }
 
 }  // namespace gcm