Push API: Fix unsubscribing from GCM on Android

content/browser/push_messaging/push_messaging_message_filter.h

Index: content/browser/push_messaging/push_messaging_message_filter.h
diff --git a/content/browser/push_messaging/push_messaging_message_filter.h b/content/browser/push_messaging/push_messaging_message_filter.h
index d14bf4716b8121651e06062fba4bff59e2e8a116..cfeadf42f0bf38adeaa68f8baa57401f1b97fde1 100644
--- a/content/browser/push_messaging/push_messaging_message_filter.h
+++ b/content/browser/push_messaging/push_messaging_message_filter.h
@@ -111,15 +111,23 @@ class PushMessagingMessageFilter : public BrowserMessageFilter {
   void OnUnregister(int request_id,
                     int64 service_worker_registration_id);
 
-  void DoUnregister(int request_id,
-                    int64 service_worker_registration_id,
-                    const GURL& requesting_origin,
-                    const std::string& push_registration_id,
-                    ServiceWorkerStatusCode service_worker_status);
+  void UnregisterWithPushRegistrationId(
+      int request_id,
+      int64 service_worker_registration_id,
+      const GURL& requesting_origin,
+      const std::string& push_registration_id,
+      ServiceWorkerStatusCode service_worker_status);
+
+  void UnregisterWithSenderId(int request_id,
+                              int64 service_worker_registration_id,
+                              const GURL& requesting_origin,
+                              const std::string& sender_id,
+                              ServiceWorkerStatusCode service_worker_status);
 
   void UnregisterFromService(int request_id,
                              int64 service_worker_registration_id,
-                             const GURL& requesting_origin);
+                             const GURL& requesting_origin,
+                             const std::string& sender_id);
 
   void DidUnregisterFromService(int request_id,
                                 int64 service_worker_registration_id,