Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/gcm_driver.h

 // 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.
 
 #ifndef COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_
 #define COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 25 matching lines @@
   typedef base::Callback<void(const std::string& token,
                               GCMClient::Result result)> GetTokenCallback;
   typedef base::Callback<void(GCMClient::Result result)> DeleteTokenCallback;
   typedef base::Callback<void(const std::string& instance_id,
                               const std::string& extra_data)>
       GetInstanceIDDataCallback;
 
   InstanceIDHandler();
   virtual ~InstanceIDHandler();
 
-  // Delete all tokens assoicated with |app_id|.
-  void DeleteAllTokensForApp(const std::string& app_id,
-                             const DeleteTokenCallback& callback);
-
   // Token service.
   virtual void GetToken(const std::string& app_id,
+                        bool use_subtype,
                         const std::string& authorized_entity,
                         const std::string& scope,
                         const std::map<std::string, std::string>& options,
                         const GetTokenCallback& callback) = 0;
   virtual void DeleteToken(const std::string& app_id,
+                           bool use_subtype,
                            const std::string& authorized_entity,
                            const std::string& scope,
                            const DeleteTokenCallback& callback) = 0;
+  // Delete all tokens assoicated with |app_id|.

[Peter Beverloo, 2016/07/22 12:17:03]

nit: Delete comment, the name is clear enough.

[johnme, 2016/07/26 17:11:56]

Done.

+  void DeleteAllTokensForApp(const std::string& app_id,
+                             bool use_subtype,
+                             const DeleteTokenCallback& callback);
 
   // Persistence support.
   virtual void AddInstanceIDData(const std::string& app_id,
                                  const std::string& instance_id,
                                  const std::string& extra_data) = 0;
   virtual void RemoveInstanceIDData(const std::string& app_id) = 0;
   virtual void GetInstanceIDData(
       const std::string& app_id,
       const GetInstanceIDDataCallback& callback) = 0;
 
@@ skipping 268 matching lines @@
   DefaultGCMAppHandler default_app_handler_;
 
   base::WeakPtrFactory<GCMDriver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMDriver);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_DRIVER_H_