Implement WebPushProvider.unregister() in Chromium.

content/child/push_messaging/push_provider.cc

 // 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.
 
 #include "content/child/push_messaging/push_provider.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "content/child/push_messaging/push_dispatcher.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_task_runner.h"
 #include "content/common/push_messaging_messages.h"
-#include "third_party/WebKit/public/platform/WebPushError.h"
 #include "third_party/WebKit/public/platform/WebPushRegistration.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 namespace content {
 namespace {
 
 int CurrentWorkerId() {
   return WorkerTaskRunner::Instance()->CurrentWorkerId();
 }
 
@@ skipping 57 matching lines @@
   DCHECK(service_worker_registration);
   DCHECK(callbacks);
   int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
   permission_status_callbacks_.AddWithID(callbacks, request_id);
   int64 service_worker_registration_id =
       GetServiceWorkerRegistrationId(service_worker_registration);
   thread_safe_sender_->Send(new PushMessagingHostMsg_GetPermissionStatus(
       request_id, service_worker_registration_id));
 }
 
+void PushProvider::unregister(

[johnme, 2014/12/16 16:31:59]

Please move this below registerPushMessaging. Remember
[Register,Unregister,GetRegistration,HasPermission,Delivery].

[mlamouri (slow - plz ping), 2014/12/16 18:26:16]

Coding style says that we have to follow declaration order in implementation.

+    blink::WebServiceWorkerRegistration* service_worker_registration,
+    blink::WebPushUnregisterCallbacks* callbacks) {
+  DCHECK(service_worker_registration);
+  DCHECK(callbacks);
+
+  int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
+  unregister_callbacks_.AddWithID(callbacks, request_id);
+
+  int64 service_worker_registration_id =
+      GetServiceWorkerRegistrationId(service_worker_registration);
+  thread_safe_sender_->Send(new PushMessagingHostMsg_Unregister(
+      request_id, service_worker_registration_id));
+}
+
 bool PushProvider::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PushProvider, message)
     IPC_MESSAGE_HANDLER(PushMessagingMsg_RegisterFromWorkerSuccess,
                         OnRegisterFromWorkerSuccess);
     IPC_MESSAGE_HANDLER(PushMessagingMsg_RegisterFromWorkerError,
                         OnRegisterFromWorkerError);
     IPC_MESSAGE_HANDLER(PushMessagingMsg_GetPermissionStatusSuccess,
                         OnGetPermissionStatusSuccess);
     IPC_MESSAGE_HANDLER(PushMessagingMsg_GetPermissionStatusError,
                         OnGetPermissionStatusError);
+    IPC_MESSAGE_HANDLER(PushMessagingMsg_UnregisterSuccess,

[johnme, 2014/12/16 16:31:59]

Please move this above GetPermissionStatusSuccess. Remember
[Register,Unregister,GetRegistration,HasPermission,Delivery].

[mlamouri (slow - plz ping), 2014/12/16 18:26:16]

Done.

+                        OnUnregisterSuccess);
+    IPC_MESSAGE_HANDLER(PushMessagingMsg_UnregisterError,
+                        OnUnregisterError);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void PushProvider::OnRegisterFromWorkerSuccess(
     int request_id,
     const GURL& endpoint,
     const std::string& registration_id) {
@@ skipping 43 matching lines @@
   blink::WebPushPermissionStatusCallbacks* callbacks =
       permission_status_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
   callbacks->onError();
 
   permission_status_callbacks_.Remove(request_id);
 }
 
+void PushProvider::OnUnregisterSuccess(int request_id, bool did_unregister) {
+  blink::WebPushUnregisterCallbacks* callbacks =
+      unregister_callbacks_.Lookup(request_id);
+  if (!callbacks)
+    return;
+
+  callbacks->onSuccess(&did_unregister);
+
+  unregister_callbacks_.Remove(request_id);
+}
+
+void PushProvider::OnUnregisterError(
+    int request_id,
+    blink::WebPushError::ErrorType error_type,
+    const std::string& error_message) {
+  blink::WebPushUnregisterCallbacks* callbacks =
+      unregister_callbacks_.Lookup(request_id);
+  if (!callbacks)
+    return;
+
+  scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
+      error_type, blink::WebString::fromUTF8(error_message)));
+  callbacks->onError(error.release());
+
+  unregister_callbacks_.Remove(request_id);
+}
+
 }  // namespace content