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 fdcd286137191db7d301df08f3ce49d13923ef07..3e12f4bd246132994ba2fed6d388a33d62132354 100644
--- a/content/browser/push_messaging/push_messaging_message_filter.h
+++ b/content/browser/push_messaging/push_messaging_message_filter.h
@@ -22,6 +22,7 @@ namespace content {
 class PushMessagingService;
 class ServiceWorkerContextWrapper;
 
+extern const char kPushSenderIdServiceWorkerKey[];
 extern const char kPushRegistrationIdServiceWorkerKey[];
 
 class PushMessagingMessageFilter : public BrowserMessageFilter {
@@ -95,11 +96,19 @@ 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 UnregisterHavingGottenPushRegistrationId(
+      int request_id,
+      int64 service_worker_registration_id,
+      const GURL& requesting_origin,
+      const std::string& push_registration_id,
+      ServiceWorkerStatusCode service_worker_status);
+
+  void UnregisterHavingGottenSenderId(
+      int request_id,
+      int64 service_worker_registration_id,
+      const GURL& requesting_origin,
+      const std::string& sender_id,
+      ServiceWorkerStatusCode service_worker_status);
 
   // Called via PostTask from UI thread.
   void ClearRegistrationData(int request_id,