Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/gcm_client_impl.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_CLIENT_IMPL_H_
 #define COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 121 matching lines @@
   void RemoveAccountMapping(const std::string& account_id) override;
   void SetLastTokenFetchTime(const base::Time& time) override;
   void UpdateHeartbeatTimer(std::unique_ptr<base::Timer> timer) 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,
                          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;
 
   // GCMStatsRecorder::Delegate implemenation.
   void OnActivityRecorded() override;
 
   // ConnectionFactory::ConnectionListener implementation.
   void OnConnected(const GURL& current_server,
                    const net::IPEndPoint& ip_endpoint) override;
   void OnDisconnected() override;
@@ skipping 124 matching lines @@
 
   // Completes the GCM store destroy request.
   void OnGCMStoreDestroyed(bool success);
 
   // Handles incoming data message and dispatches it the delegate of this class.
   void HandleIncomingMessage(const gcm::MCSMessage& message);
 
   // 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);
 
   // Is there any standalone app being registered for GCM?
   bool HasStandaloneRegisteredApp() const;
 
   // Destroys the store when it is not needed.
   void DestroyStoreWhenNotNeeded();
 
   // Reset all cahced values.
@@ skipping 77 matching lines @@
 
   // Factory for creating references in callbacks.
   base::WeakPtrFactory<GCMClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMClientImpl);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_