Push API: Fix unsubscribing from GCM on Android

components/gcm_driver/gcm_driver_desktop.cc

Index: components/gcm_driver/gcm_driver_desktop.cc
diff --git a/components/gcm_driver/gcm_driver_desktop.cc b/components/gcm_driver/gcm_driver_desktop.cc
index 6a9153986819f84471c5c6d49f7df3d8c5201986..92f7ae3ab4ba4447c7190e4d8bcd1a2653b9660d 100644
--- a/components/gcm_driver/gcm_driver_desktop.cc
+++ b/components/gcm_driver/gcm_driver_desktop.cc
@@ -522,7 +522,8 @@ void GCMDriverDesktop::DoRegister(const std::string& app_id,
                  sender_ids));
 }
 
-void GCMDriverDesktop::UnregisterImpl(const std::string& app_id) {
+void GCMDriverDesktop::UnregisterImpl(
+    const std::string& app_id, const std::string* /* maybe_sender_id */) {

[Peter Beverloo, 2015/02/17 18:49:36]

nit: Please name the argument.

[johnme, 2015/02/17 21:24:07]

Removed.

   // Delay the unregister operation until GCMClient is ready.
   if (!delayed_task_controller_->CanRunTaskWithoutDelay()) {
     delayed_task_controller_->AddTask(