Push API: Fix unsubscribing from GCM on Android

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 04fb53660dbd7db2ec8ee9603c895b46c1baab50..15e75dec5822d392f0655bf3470961e3c666bddb 100644
--- a/components/gcm_driver/gcm_driver.h
+++ b/components/gcm_driver/gcm_driver.h
@@ -50,8 +50,11 @@ class GCMDriver {
 
   // Unregisters an app from using GCM.
   // |app_id|: application ID.
+  // |sender_ids|: list of IDs of the sender IDs that were passed when
+  //               registering. On desktop these are ignored.
   // |callback|: to be called once the asynchronous operation is done.
   void Unregister(const std::string& app_id,
+                  const std::vector<std::string>& sender_ids,
                   const UnregisterCallback& callback);
 
   // Sends a message to a given receiver.
@@ -144,7 +147,8 @@ class GCMDriver {
                             const std::vector<std::string>& sender_ids) = 0;
 
   // Platform-specific implementation of Unregister.
-  virtual void UnregisterImpl(const std::string& app_id) = 0;
+  virtual void UnregisterImpl(const std::string& app_id,
+                              const std::vector<std::string>& sender_ids) = 0;
 
   // Platform-specific implementation of Send.
   virtual void SendImpl(const std::string& app_id,