Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/gcm_driver.h

Index: components/gcm_driver/gcm_driver.h
diff --git a/components/gcm_driver/gcm_driver.h b/components/gcm_driver/gcm_driver.h
index 6cf0cdf3e20f442a64072a0167d1181fd47d97b6..daf994d783a2d6325191649b75c5eaefeacc29ce 100644
--- a/components/gcm_driver/gcm_driver.h
+++ b/components/gcm_driver/gcm_driver.h
@@ -43,20 +43,21 @@ class InstanceIDHandler {
   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;
+  void DeleteAllTokensForApp(const std::string& app_id,
+                             bool use_subtype,
+                             const DeleteTokenCallback& callback);
 
   // Persistence support.
   virtual void AddInstanceIDData(const std::string& app_id,