Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/gcm_client_impl.h

Index: components/gcm_driver/gcm_client_impl.h
diff --git a/components/gcm_driver/gcm_client_impl.h b/components/gcm_driver/gcm_client_impl.h
index f4cc121a59938692bfcae8a96bf3a2f6756c6d60..fa976ae88b39386ca2009d517b4d9207e645b9b7 100644
--- a/components/gcm_driver/gcm_client_impl.h
+++ b/components/gcm_driver/gcm_client_impl.h
@@ -139,6 +139,7 @@ class GCMClientImpl
   void GetInstanceIDData(const std::string& app_id,
                          std::string* instance_id,
                          std::string* extra_data) override;
+  bool CategoryHasSubtype(const std::string& category) override;
   void AddHeartbeatInterval(const std::string& scope, int interval_ms) override;
   void RemoveHeartbeatInterval(const std::string& scope) override;
 
@@ -283,12 +284,15 @@ class GCMClientImpl
   // Fires OnMessageReceived event on the delegate of this class, based on the
   // details in |data_message_stanza| and |message_data|.
   void HandleIncomingDataMessage(
+      const std::string& app_id,
+      bool use_subtype,
       const mcs_proto::DataMessageStanza& data_message_stanza,
       MessageData& message_data);
 
   // Fires OnMessageSendError event on the delegate of this calss, based on the
   // details in |data_message_stanza| and |message_data|.
   void HandleIncomingSendError(
+      const std::string& app_id,
       const mcs_proto::DataMessageStanza& data_message_stanza,
       MessageData& message_data);