Add support for GCM subtypes to desktop Instance ID implementation

google_apis/gcm/engine/instance_id_get_token_request_handler.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/instance_id_get_token_request_handler.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "google_apis/gcm/base/gcm_util.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace gcm {
 
 namespace {
 
 // Request constants.
 const char kAuthorizedEntityKey[] = "sender";
-const char kSubtypeKey[] = "X-subtype";
 const char kGMSVersionKey[] = "gmsv";
 const char kInstanceIDKey[] = "appid";
 const char kScopeKey[] = "scope";
 const char kExtraScopeKey[] = "X-scope";
 // Prefix that needs to be added for each option key.
 const char kOptionKeyPrefix[] = "X-";
 
 }  // namespace
 
 InstanceIDGetTokenRequestHandler::InstanceIDGetTokenRequestHandler(
@@ skipping 15 matching lines @@
 InstanceIDGetTokenRequestHandler::~InstanceIDGetTokenRequestHandler() {}
 
 void InstanceIDGetTokenRequestHandler::BuildRequestBody(std::string* body){
   BuildFormEncoding(kScopeKey, scope_, body);
   BuildFormEncoding(kExtraScopeKey, scope_, body);
   for (auto iter = options_.begin(); iter != options_.end(); ++iter)
     BuildFormEncoding(kOptionKeyPrefix + iter->first, iter->second, body);
   BuildFormEncoding(kGMSVersionKey, base::IntToString(gcm_version_), body);
   BuildFormEncoding(kInstanceIDKey, instance_id_, body);
   BuildFormEncoding(kAuthorizedEntityKey, authorized_entity_, body);
-  // TODO(jianli): To work around server bug. To be removed when the server fix
-  // is deployed.
-  BuildFormEncoding(kSubtypeKey, authorized_entity_, body);
 }
 
 void InstanceIDGetTokenRequestHandler::ReportUMAs(
     RegistrationRequest::Status status,
     int retry_count,
     base::TimeDelta complete_time) {
   UMA_HISTOGRAM_ENUMERATION("InstanceID.GetToken.RequestStatus",
                             status,
                             RegistrationRequest::STATUS_COUNT);
 
   // Other UMAs are only reported when the request succeeds.
   if (status != RegistrationRequest::SUCCESS)
     return;
 
   UMA_HISTOGRAM_COUNTS("InstanceID.GetToken.RetryCount", retry_count);
   UMA_HISTOGRAM_TIMES("InstanceID.GetToken.CompleteTime", complete_time);
 }
 
 }  // namespace gcm