Push API: use (un)subscription instead of (un)registration

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"
@@ skipping 57 matching lines @@
 void PushProvider::subscribe(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const blink::WebPushSubscriptionOptions& options,
     blink::WebPushSubscriptionCallbacks* callbacks) {
   DCHECK(service_worker_registration);
   DCHECK(callbacks);
   int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
   subscription_callbacks_.AddWithID(callbacks, request_id);
   int64 service_worker_registration_id =
       GetServiceWorkerRegistrationId(service_worker_registration);
-  thread_safe_sender_->Send(new PushMessagingHostMsg_RegisterFromWorker(
+  thread_safe_sender_->Send(new PushMessagingHostMsg_SubscribeFromWorker(
       request_id, service_worker_registration_id, options.userVisibleOnly));
 }
 
 void PushProvider::unsubscribe(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     blink::WebPushUnsubscribeCallbacks* callbacks) {
   DCHECK(service_worker_registration);
   DCHECK(callbacks);
 
   int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
   unsubscribe_callbacks_.AddWithID(callbacks, request_id);
 
   int64 service_worker_registration_id =
       GetServiceWorkerRegistrationId(service_worker_registration);
-  thread_safe_sender_->Send(new PushMessagingHostMsg_Unregister(
+  thread_safe_sender_->Send(new PushMessagingHostMsg_Unsubscribe(
       request_id, service_worker_registration_id));
 }
 
 void PushProvider::getSubscription(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     blink::WebPushSubscriptionCallbacks* callbacks) {
   DCHECK(service_worker_registration);
   DCHECK(callbacks);
   int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
   subscription_callbacks_.AddWithID(callbacks, request_id);
@@ skipping 13 matching lines @@
   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, options.userVisibleOnly));
 }
 
 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_UnregisterSuccess,
-                        OnUnregisterSuccess);
-    IPC_MESSAGE_HANDLER(PushMessagingMsg_UnregisterError,
-                        OnUnregisterError);
+    IPC_MESSAGE_HANDLER(PushMessagingMsg_SubscribeFromWorkerSuccess,
+                        OnSubscribeFromWorkerSuccess);
+    IPC_MESSAGE_HANDLER(PushMessagingMsg_SubscribeFromWorkerError,
+                        OnSubscribeFromWorkerError);
+    IPC_MESSAGE_HANDLER(PushMessagingMsg_UnsubscribeSuccess,
+                        OnUnsubscribeSuccess);
+    IPC_MESSAGE_HANDLER(PushMessagingMsg_UnsubscribeError,
+                        OnUnsubscribeError);
     IPC_MESSAGE_HANDLER(PushMessagingMsg_GetRegistrationSuccess,
                         OnGetRegistrationSuccess);
     IPC_MESSAGE_HANDLER(PushMessagingMsg_GetRegistrationError,
                         OnGetRegistrationError);
     IPC_MESSAGE_HANDLER(PushMessagingMsg_GetPermissionStatusSuccess,
                         OnGetPermissionStatusSuccess);
     IPC_MESSAGE_HANDLER(PushMessagingMsg_GetPermissionStatusError,
                         OnGetPermissionStatusError);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
-void PushProvider::OnRegisterFromWorkerSuccess(
+void PushProvider::OnSubscribeFromWorkerSuccess(
     int request_id,
     const GURL& endpoint,
-    const std::string& registration_id) {
+    const std::string& subscription_id) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
   scoped_ptr<blink::WebPushSubscription> subscription(
       new blink::WebPushSubscription(
           blink::WebString::fromUTF8(endpoint.spec()),
-          blink::WebString::fromUTF8(registration_id)));
+          blink::WebString::fromUTF8(subscription_id)));
   callbacks->onSuccess(subscription.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
-void PushProvider::OnRegisterFromWorkerError(int request_id,
-                                             PushRegistrationStatus status) {
+void PushProvider::OnSubscribeFromWorkerError(int request_id,
+                                              PushRegistrationStatus status) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
   scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
       blink::WebPushError::ErrorTypeAbort,
       blink::WebString::fromUTF8(PushRegistrationStatusToString(status))));
   callbacks->onError(error.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
-void PushProvider::OnUnregisterSuccess(int request_id, bool did_unregister) {
+void PushProvider::OnUnsubscribeSuccess(int request_id, bool did_unsubscribe) {
   blink::WebPushUnsubscribeCallbacks* callbacks =
       unsubscribe_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
-  callbacks->onSuccess(&did_unregister);
+  callbacks->onSuccess(&did_unsubscribe);
 
   unsubscribe_callbacks_.Remove(request_id);
 }
 
-void PushProvider::OnUnregisterError(
+void PushProvider::OnUnsubscribeError(
     int request_id,
     blink::WebPushError::ErrorType error_type,
     const std::string& error_message) {
   blink::WebPushUnsubscribeCallbacks* callbacks =
       unsubscribe_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
   scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
       error_type, blink::WebString::fromUTF8(error_message)));
@@ skipping 64 matching lines @@
 
   scoped_ptr<blink::WebPushError> web_error(new blink::WebPushError(
       error, blink::WebString::fromUTF8(error_message)));
 
   callbacks->onError(web_error.release());
 
   permission_status_callbacks_.Remove(request_id);
 }
 
 }  // namespace content