Support getting and deleting token for Instance ID.

google_apis/gcm/engine/registration_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/registration_request.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.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/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
 
 namespace gcm {
 
 namespace {
 
 const char kRegistrationRequestContentType[] =
     "application/x-www-form-urlencoded";
 
 // Request constants.
 const char kAppIdKey[] = "app";
 const char kDeviceIdKey[] = "device";
 const char kLoginHeader[] = "AidLogin";
-const char kSenderKey[] = "sender";
-
-// Request validation constants.
-const size_t kMaxSenders = 100;
 
 // Response constants.
 const char kErrorPrefix[] = "Error=";
 const char kTokenPrefix[] = "token=";
 const char kDeviceRegistrationError[] = "PHONE_REGISTRATION_ERROR";
 const char kAuthenticationFailed[] = "AUTHENTICATION_FAILED";
 const char kInvalidSender[] = "INVALID_SENDER";
 const char kInvalidParameters[] = "INVALID_PARAMETERS";
 
-void BuildFormEncoding(const std::string& key,
-                       const std::string& value,
-                       std::string* out) {
-  if (!out->empty())
-    out->append("&");
-  out->append(key + "=" + net::EscapeUrlEncodedData(value, true));
-}
-
 // Gets correct status from the error message.
 RegistrationRequest::Status GetStatusFromError(const std::string& error) {
   // TODO(fgorski): Improve error parsing in case there is nore then just an
   // Error=ERROR_STRING in response.
   if (error.find(kDeviceRegistrationError) != std::string::npos)
     return RegistrationRequest::DEVICE_REGISTRATION_ERROR;
   if (error.find(kAuthenticationFailed) != std::string::npos)
     return RegistrationRequest::AUTHENTICATION_FAILED;
   if (error.find(kInvalidSender) != std::string::npos)
     return RegistrationRequest::INVALID_SENDER;
@@ skipping 16 matching lines @@
 void RecordRegistrationStatusToUMA(RegistrationRequest::Status status) {
   UMA_HISTOGRAM_ENUMERATION("GCM.RegistrationRequestStatus", status,
                             RegistrationRequest::STATUS_COUNT);
 }
 
 }  // namespace
 
 RegistrationRequest::RequestInfo::RequestInfo(
     uint64 android_id,
     uint64 security_token,
-    const std::string& app_id,
-    const std::vector<std::string>& sender_ids)
+    const std::string& app_id)
     : android_id(android_id),
       security_token(security_token),
-      app_id(app_id),
-      sender_ids(sender_ids) {
+      app_id(app_id) {

[Nicolas Zea, 2015/05/21 21:07:51]

Maybe DCHECK that the values are set?

[jianli, 2015/05/21 23:11:24]

Done.

 }
 
 RegistrationRequest::RequestInfo::~RequestInfo() {}
 
 RegistrationRequest::RegistrationRequest(
     const GURL& registration_url,
     const RequestInfo& request_info,
     const net::BackoffEntry::Policy& backoff_policy,
     const RegistrationCallback& callback,
     int max_retry_count,
     scoped_refptr<net::URLRequestContextGetter> request_context_getter,
     GCMStatsRecorder* recorder)
     : callback_(callback),
       request_info_(request_info),
       registration_url_(registration_url),
       backoff_entry_(&backoff_policy),
       request_context_getter_(request_context_getter),
       retries_left_(max_retry_count),
       recorder_(recorder),
       weak_ptr_factory_(this) {
   DCHECK_GE(max_retry_count, 0);
 }
 
 RegistrationRequest::~RegistrationRequest() {}
 
 void RegistrationRequest::Start() {
   DCHECK(!callback_.is_null());
-  DCHECK(request_info_.android_id != 0UL);
-  DCHECK(request_info_.security_token != 0UL);
-  DCHECK(0 < request_info_.sender_ids.size() &&
-         request_info_.sender_ids.size() <= kMaxSenders);
+  DCHECK(!url_fetcher_.get());
 
-  DCHECK(!url_fetcher_.get());
   url_fetcher_ =
       net::URLFetcher::Create(registration_url_, net::URLFetcher::POST, this);
   url_fetcher_->SetRequestContext(request_context_getter_.get());
   url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                              net::LOAD_DO_NOT_SAVE_COOKIES);
 
-  std::string android_id = base::Uint64ToString(request_info_.android_id);
-  std::string auth_header =
-      std::string(net::HttpRequestHeaders::kAuthorization) + ": " +
-      kLoginHeader + " " + android_id + ":" +
-      base::Uint64ToString(request_info_.security_token);
-  url_fetcher_->SetExtraRequestHeaders(auth_header);
+  std::string extra_headers;
+  BuildRequestHeaders(&extra_headers);
+  url_fetcher_->SetExtraRequestHeaders(extra_headers);
 
   std::string body;
-  BuildFormEncoding(kAppIdKey, request_info_.app_id, &body);
-  BuildFormEncoding(kDeviceIdKey, android_id, &body);
-
-  std::string senders;
-  for (std::vector<std::string>::const_iterator iter =
-           request_info_.sender_ids.begin();
-       iter != request_info_.sender_ids.end();
-       ++iter) {
-    DCHECK(!iter->empty());
-    if (!senders.empty())
-      senders.append(",");
-    senders.append(*iter);
-  }
-  BuildFormEncoding(kSenderKey, senders, &body);
-  UMA_HISTOGRAM_COUNTS("GCM.RegistrationSenderIdCount",
-                       request_info_.sender_ids.size());
+  BuildRequestBody(&body);
 
   DVLOG(1) << "Performing registration for: " << request_info_.app_id;
   DVLOG(1) << "Registration request: " << body;
   url_fetcher_->SetUploadData(kRegistrationRequestContentType, body);
-  recorder_->RecordRegistrationSent(request_info_.app_id, senders);
+  recorder_->RecordRegistrationSent(request_info_.app_id,
+                                    GetSourceForRecorder());
   request_start_time_ = base::TimeTicks::Now();
   url_fetcher_->Start();
 }
 
+void RegistrationRequest::BuildRequestHeaders(std::string* extra_headers) {
+  net::HttpRequestHeaders headers;
+  headers.SetHeader(
+      net::HttpRequestHeaders::kAuthorization,
+      std::string(kLoginHeader) + " " +
+          base::Uint64ToString(request_info_.android_id) + ":" +
+          base::Uint64ToString(request_info_.security_token));
+  *extra_headers = headers.ToString();
+}
+
+void RegistrationRequest::BuildRequestBody(std::string* body) {
+  DCHECK(request_info_.android_id != 0UL &&
+         request_info_.security_token != 0UL);
+
+  BuildFormEncoding(kAppIdKey, request_info_.app_id, body);
+  BuildFormEncoding(kDeviceIdKey,
+                    base::Uint64ToString(request_info_.android_id),
+                    body);
+}
+
 void RegistrationRequest::RetryWithBackoff(bool update_backoff) {
   if (update_backoff) {
     DCHECK_GT(retries_left_, 0);
     --retries_left_;
     url_fetcher_.reset();
     backoff_entry_.InformOfRequest(false);
   }
 
   if (backoff_entry_.ShouldRejectRequest()) {
     DVLOG(1) << "Delaying GCM registration of app: "
@@ skipping 52 matching lines @@
 
   return UNKNOWN_ERROR;
 }
 
 void RegistrationRequest::OnURLFetchComplete(const net::URLFetcher* source) {
   std::string token;
   Status status = ParseResponse(source, &token);
   RecordRegistrationStatusToUMA(status);
   recorder_->RecordRegistrationResponse(
       request_info_.app_id,
-      request_info_.sender_ids,
+      GetSourceForRecorder(),
       status);
 
   if (ShouldRetryWithStatus(status)) {
     if (retries_left_ > 0) {
       recorder_->RecordRegistrationRetryRequested(
           request_info_.app_id,
-          request_info_.sender_ids,
+          GetSourceForRecorder(),
           retries_left_);
       RetryWithBackoff(true);
       return;
     }
 
     status = REACHED_MAX_RETRIES;
     recorder_->RecordRegistrationResponse(
         request_info_.app_id,
-        request_info_.sender_ids,
+        GetSourceForRecorder(),
         status);
     RecordRegistrationStatusToUMA(status);
   }
 
   if (status == SUCCESS) {
     UMA_HISTOGRAM_COUNTS("GCM.RegistrationRetryCount",
                          backoff_entry_.failure_count());
     UMA_HISTOGRAM_TIMES("GCM.RegistrationCompleteTime",
                         base::TimeTicks::Now() - request_start_time_);
   }
   callback_.Run(status, token);
 }
 
 }  // namespace gcm