Push API: Refactor and fix unsubscribe API

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 faa52c440db71afda0907ea036a428134095ff2e..5dd7aaaa5f84f3d9c47c1c7ef05da42da95c6ded 100644
--- a/content/browser/push_messaging/push_messaging_message_filter.h
+++ b/content/browser/push_messaging/push_messaging_message_filter.h
@@ -96,22 +96,13 @@ class PushMessagingMessageFilter : public BrowserMessageFilter {
 
   void OnUnsubscribe(int request_id, int64_t service_worker_registration_id);
 
-  void UnsubscribeHavingGottenIds(
+  void UnsubscribeHavingGottenSenderId(
       int request_id,
       int64_t service_worker_registration_id,
       const GURL& requesting_origin,
-      const std::vector<std::string>& push_subscription_and_sender_ids,
+      const std::vector<std::string>& sender_id,
       ServiceWorkerStatusCode service_worker_status);
 
-  // Called via PostTask from UI thread.
-  void ClearRegistrationData(int request_id,
-                             int64_t service_worker_registration_id,
-                             PushUnregistrationStatus unregistration_status);
-
-  void DidClearRegistrationData(int request_id,
-                                PushUnregistrationStatus unregistration_status,
-                                ServiceWorkerStatusCode service_worker_status);
-
   // Called both from IO thread, and via PostTask from UI thread.
   void DidUnregister(int request_id,
                      PushUnregistrationStatus unregistration_status);