Add support for GCM subtypes to desktop Instance ID implementation

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 <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 15 matching lines @@
 #include "url/gurl.h"
 
 namespace gcm {
 
 namespace {
 
 const char kRegistrationRequestContentType[] =
     "application/x-www-form-urlencoded";
 
 // Request constants.
-const char kAppIdKey[] = "app";
+const char kCategoryKey[] = "app";
+const char kSubtypeKey[] = "X-subtype";
 const char kDeviceIdKey[] = "device";
 const char kLoginHeader[] = "AidLogin";
 
 // 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";
@@ skipping 19 matching lines @@
   return status == RegistrationRequest::UNKNOWN_ERROR ||
          status == RegistrationRequest::AUTHENTICATION_FAILED ||
          status == RegistrationRequest::DEVICE_REGISTRATION_ERROR ||
          status == RegistrationRequest::HTTP_NOT_OK ||
          status == RegistrationRequest::URL_FETCHING_FAILED ||
          status == RegistrationRequest::RESPONSE_PARSING_FAILED;
 }
 
 }  // namespace
 
-RegistrationRequest::RequestInfo::RequestInfo(uint64_t android_id,
-                                              uint64_t security_token,
-                                              const std::string& app_id)
-    : android_id(android_id), security_token(security_token), app_id(app_id) {
+RegistrationRequest::RequestInfo::RequestInfo(
+    uint64_t android_id,
+    uint64_t security_token,
+    const std::string& app_id,

[jianli, 2016/08/08 22:11:51]

Can we refactor this to pass category and subtype?

[johnme, 2016/08/10 13:09:55]

Done.

+    bool use_subtype,
+    const std::string& product_category_for_subtypes)
+    : android_id(android_id),
+      security_token(security_token),
+      app_id(app_id),
+      use_subtype(use_subtype),
+      product_category_for_subtypes(product_category_for_subtypes) {
   DCHECK(android_id != 0UL);
   DCHECK(security_token != 0UL);
 }
 
 RegistrationRequest::RequestInfo::~RequestInfo() {}
 
 RegistrationRequest::CustomRequestHandler::CustomRequestHandler() {}
 
 RegistrationRequest::CustomRequestHandler::~CustomRequestHandler() {}
 
@@ skipping 51 matching lines @@
   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) {
-  BuildFormEncoding(kAppIdKey, request_info_.app_id, body);
+  if (request_info_.use_subtype) {
+    BuildFormEncoding(kCategoryKey, request_info_.product_category_for_subtypes,
+                      body);
+    BuildFormEncoding(kSubtypeKey, request_info_.app_id, body);
+  } else {
+    BuildFormEncoding(kCategoryKey, request_info_.app_id, body);
+  }
+
   BuildFormEncoding(kDeviceIdKey,
                     base::Uint64ToString(request_info_.android_id),
                     body);
 
   DCHECK(custom_request_handler_.get());
   custom_request_handler_->BuildRequestBody(body);
 }
 
 void RegistrationRequest::RetryWithBackoff() {
   DCHECK_GT(retries_left_, 0);
@@ skipping 87 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, token);
 }
 
 }  // namespace gcm