Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/instance_id/instance_id_impl.cc

 // Copyright 2015 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 "components/gcm_driver/instance_id/instance_id_impl.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 31 matching lines @@
     default:
       NOTREACHED() << "Unexpected value of result cannot be converted: "
                    << result;
   }
   return InstanceID::UNKNOWN_ERROR;
 }
 
 }  // namespace
 
 // static
-std::unique_ptr<InstanceID> InstanceID::Create(const std::string& app_id,
-                                               gcm::GCMDriver* gcm_driver) {
-  return base::WrapUnique(new InstanceIDImpl(app_id, gcm_driver));
+std::unique_ptr<InstanceID> InstanceID::CreateInternal(
+    const std::string& app_id,
+    bool use_subtype,
+    gcm::GCMDriver* gcm_driver) {
+  return base::WrapUnique(new InstanceIDImpl(app_id, use_subtype, gcm_driver));
 }
 
 InstanceIDImpl::InstanceIDImpl(const std::string& app_id,
+                               bool use_subtype,
                                gcm::GCMDriver* gcm_driver)
-    : InstanceID(app_id, gcm_driver), weak_ptr_factory_(this) {
+    : InstanceID(app_id, gcm_driver),
+      use_subtype_(use_subtype),
+      weak_ptr_factory_(this) {
   Handler()->GetInstanceIDData(
       app_id, base::Bind(&InstanceIDImpl::GetInstanceIDDataCompleted,
                          weak_ptr_factory_.GetWeakPtr()));
 }
 
 InstanceIDImpl::~InstanceIDImpl() {
 }
 
 void InstanceIDImpl::GetID(const GetIDCallback& callback) {
   if (!delayed_task_controller_.CanRunTaskWithoutDelay()) {
@@ skipping 51 matching lines @@
   DoGetToken(authorized_entity, scope, options, callback);
 }
 
 void InstanceIDImpl::DoGetToken(
     const std::string& authorized_entity,
     const std::string& scope,
     const std::map<std::string, std::string>& options,
     const GetTokenCallback& callback) {
   EnsureIDGenerated();
 
-  Handler()->GetToken(app_id(), authorized_entity, scope, options,
+  Handler()->GetToken(app_id(), use_subtype_, authorized_entity, scope, options,
                       base::Bind(&InstanceIDImpl::OnGetTokenCompleted,
                                  weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void InstanceIDImpl::DeleteTokenImpl(const std::string& authorized_entity,
                                      const std::string& scope,
                                      const DeleteTokenCallback& callback) {
   DCHECK(!authorized_entity.empty());
   DCHECK(!scope.empty());
 
@@ skipping 13 matching lines @@
 void InstanceIDImpl::DoDeleteToken(
     const std::string& authorized_entity,
     const std::string& scope,
     const DeleteTokenCallback& callback) {
   // Nothing to delete if the ID has not been generated.
   if (id_.empty()) {
     callback.Run(InstanceID::INVALID_PARAMETER);
     return;
   }
 
-  Handler()->DeleteToken(app_id(), authorized_entity, scope,
-                        base::Bind(&InstanceIDImpl::OnDeleteTokenCompleted,
-                                   weak_ptr_factory_.GetWeakPtr(), callback));
+  Handler()->DeleteToken(app_id(), use_subtype_, authorized_entity, scope,
+                         base::Bind(&InstanceIDImpl::OnDeleteTokenCompleted,
+                                    weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void InstanceIDImpl::DeleteIDImpl(const DeleteIDCallback& callback) {
   if (!delayed_task_controller_.CanRunTaskWithoutDelay()) {
     delayed_task_controller_.AddTask(
         base::Bind(&InstanceIDImpl::DoDeleteID,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback));
     return;
   }
 
   DoDeleteID(callback);
 }
 
 void InstanceIDImpl::DoDeleteID(const DeleteIDCallback& callback) {
   // Nothing to do if ID has not been generated.
   if (id_.empty()) {
     callback.Run(InstanceID::SUCCESS);
     return;
   }
 
   Handler()->DeleteAllTokensForApp(
-      app_id(), base::Bind(&InstanceIDImpl::OnDeleteIDCompleted,
-                           weak_ptr_factory_.GetWeakPtr(), callback));
+      app_id(), use_subtype_,
+      base::Bind(&InstanceIDImpl::OnDeleteIDCompleted,
+                 weak_ptr_factory_.GetWeakPtr(), callback));
 
   Handler()->RemoveInstanceIDData(app_id());
 
   id_.clear();
   creation_time_ = base::Time();
 }
 
 void InstanceIDImpl::OnGetTokenCompleted(const GetTokenCallback& callback,
                                          const std::string& token,
                                          gcm::GCMClient::Result result) {
@@ skipping 66 matching lines @@
 }
 
 gcm::InstanceIDHandler* InstanceIDImpl::Handler() {
   gcm::InstanceIDHandler* handler =
       gcm_driver()->GetInstanceIDHandlerInternal();
   DCHECK(handler);
   return handler;
 }
 
 }  // namespace instance_id