Implement WebPushProvider.unregister() in Chromium.

content/child/push_messaging/push_provider.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_CHILD_PUSH_MESSAGING_PUSH_MANAGER_H_
 #define CONTENT_CHILD_PUSH_MESSAGING_PUSH_MANAGER_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 15 matching lines @@
   // The |thread_safe_sender| and |push_dispatcher| are used if calling this
   // leads to construction.
   static PushProvider* ThreadSpecificInstance(
       ThreadSafeSender* thread_safe_sender,
       PushDispatcher* push_dispatcher);
 
   // WorkerTaskRunner::Observer implementation.
   void OnWorkerRunLoopStopped() override;
 
   // blink::WebPushProvider implementation.
-  void registerPushMessaging(blink::WebServiceWorkerRegistration*,
-                             blink::WebPushRegistrationCallbacks*) override;
-  void getPermissionStatus(blink::WebServiceWorkerRegistration*,
-                           blink::WebPushPermissionStatusCallbacks*) override;
+  virtual void registerPushMessaging(blink::WebServiceWorkerRegistration*,
+                                     blink::WebPushRegistrationCallbacks*);
+  virtual void getPermissionStatus(blink::WebServiceWorkerRegistration*,
+                                   blink::WebPushPermissionStatusCallbacks*);
+  virtual void unregister(blink::WebServiceWorkerRegistration*,
+                          blink::WebPushUnregisterCallbacks*);
 
   // Called by the PushDispatcher.
   bool OnMessageReceived(const IPC::Message& message);
 
  private:
   PushProvider(ThreadSafeSender* thread_safe_sender,
                PushDispatcher* push_dispatcher);
 
   // IPC message handlers.
   void OnRegisterFromWorkerSuccess(int request_id,
                                    const GURL& endpoint,
                                    const std::string& registration_id);
   void OnRegisterFromWorkerError(int request_id, PushRegistrationStatus status);
   void OnGetPermissionStatusSuccess(int request_id,
                                     blink::WebPushPermissionStatus status);
   void OnGetPermissionStatusError(int request_id);
+  void OnUnregisterResponse(int request_id, bool response);

[Michael van Ouwerkerk, 2014/12/12 13:55:41]

nit: consider renaming |response| to something more meaningful such as
|success|.

[mlamouri (slow - plz ping), 2014/12/15 11:29:37]

Done.

 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
   scoped_refptr<PushDispatcher> push_dispatcher_;
 
   // Stores the registration callbacks with their request ids. This class owns
   // the callbacks.
   std::map<int, blink::WebPushRegistrationCallbacks*> registration_callbacks_;
 
   // Stores the permission status callbacks with their request ids. This class
   // owns the callbacks.
   std::map<int, blink::WebPushPermissionStatusCallbacks*>
       permission_status_callbacks_;
 
+  // Stores the unregistration callbacks with their request ids. This class owns
+  // the callbacks.
+  std::map<int, blink::WebPushUnregisterCallbacks*> unregister_callbacks_;

[Michael van Ouwerkerk, 2014/12/12 13:55:41]

Aha, leaking a whole map of raw pointers, just like me :-) If this class is
destroyed before the IPC responds, these leak. See ~PushProvider.

[mlamouri (slow - plz ping), 2014/12/15 11:29:37]

Yeah. Right. I usually use IDMap<> and have it own the callbacks. Why don't we
do the same here?

(Fixed, but I would love to change that in a follow-up.)

+
   DISALLOW_COPY_AND_ASSIGN(PushProvider);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_PUSH_MESSAGING_PUSH_MANAGER_H_