Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/gcm_driver_desktop.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_DESKTOP_H_
 #define COMPONENTS_GCM_DRIVER_GCM_DRIVER_DESKTOP_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 93 matching lines @@
   void UnregisterImpl(const std::string& app_id) override;
   void SendImpl(const std::string& app_id,
                 const std::string& receiver_id,
                 const OutgoingMessage& message) override;
   void RecordDecryptionFailure(const std::string& app_id,
                                GCMEncryptionProvider::DecryptionResult result)
       override;
 
   // InstanceIDHandler implementation:
   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) override;
   void DeleteToken(const std::string& app_id,
+                   bool use_subtype,
                    const std::string& authorized_entity,
                    const std::string& scope,
                    const DeleteTokenCallback& callback) override;
   void AddInstanceIDData(const std::string& app_id,
                          const std::string& instance_id,
                          const std::string& extra_data) override;
   void RemoveInstanceIDData(const std::string& app_id) override;
   void GetInstanceIDData(const std::string& app_id,
                          const GetInstanceIDDataCallback& callback) override;
 
@@ skipping 16 matching lines @@
   void DoUnregister(const std::string& app_id);
   void DoSend(const std::string& app_id,
               const std::string& receiver_id,
               const OutgoingMessage& message);
   void DoAddInstanceIDData(const std::string& app_id,
                            const std::string& instance_id,
                            const std::string& extra_data);
   void DoRemoveInstanceIDData(const std::string& app_id);
   void DoGetInstanceIDData(const std::string& app_id);
   void DoGetToken(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);
   void DoDeleteToken(const std::string& app_id,
+                     bool use_subtype,
                      const std::string& authorized_entity,
                      const std::string& scope);
 
   // Callbacks posted from IO thread to UI thread.
   void MessageReceived(const std::string& app_id,
                        const IncomingMessage& message);
   void MessagesDeleted(const std::string& app_id);
   void MessageSendError(const std::string& app_id,
                         const GCMClient::SendErrorDetails& send_error_details);
   void SendAcknowledged(const std::string& app_id,
@@ skipping 70 matching lines @@
 
   // Used to pass a weak pointer to the IO worker.
   base::WeakPtrFactory<GCMDriverDesktop> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMDriverDesktop);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_DRIVER_DESKTOP_H_