Push API: Refactor and fix unsubscribe API

chrome/browser/push_messaging/push_messaging_service_impl.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 CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 
 #include <stdint.h>
 #include <memory>
 #include <set>
@@ skipping 60 matching lines @@
   void OnMessagesDeleted(const std::string& app_id) override;
   void OnSendError(
       const std::string& app_id,
       const gcm::GCMClient::SendErrorDetails& send_error_details) override;
   void OnSendAcknowledged(const std::string& app_id,
                           const std::string& message_id) override;
   bool CanHandle(const std::string& app_id) const override;
 
   // content::PushMessagingService implementation:
   GURL GetEndpoint(bool standard_protocol) const override;
-  void SubscribeFromDocument(
-      const GURL& requesting_origin,
-      int64_t service_worker_registration_id,
-      int renderer_id,
-      int render_frame_id,
-      const content::PushSubscriptionOptions& options,
-      const content::PushMessagingService::RegisterCallback& callback) override;
-  void SubscribeFromWorker(
-      const GURL& requesting_origin,
-      int64_t service_worker_registration_id,
-      const content::PushSubscriptionOptions& options,
-      const content::PushMessagingService::RegisterCallback& callback) override;
-  void GetEncryptionInfo(
-      const GURL& origin,
-      int64_t service_worker_registration_id,
-      const std::string& sender_id,
-      const content::PushMessagingService::EncryptionInfoCallback& callback)
-      override;
-  void Unsubscribe(
-      const GURL& requesting_origin,
-      int64_t service_worker_registration_id,
-      const std::string& sender_id,
-      const content::PushMessagingService::UnregisterCallback&) override;
+  void SubscribeFromDocument(const GURL& requesting_origin,
+                             int64_t service_worker_registration_id,
+                             int renderer_id,
+                             int render_frame_id,
+                             const content::PushSubscriptionOptions& options,
+                             const RegisterCallback& callback) override;
+  void SubscribeFromWorker(const GURL& requesting_origin,
+                           int64_t service_worker_registration_id,
+                           const content::PushSubscriptionOptions& options,
+                           const RegisterCallback& callback) override;
+  void GetEncryptionInfo(const GURL& origin,
+                         int64_t service_worker_registration_id,
+                         const std::string& sender_id,
+                         const EncryptionInfoCallback& callback) override;
+  void Unsubscribe(const GURL& requesting_origin,
+                   int64_t service_worker_registration_id,
+                   const std::string& sender_id,
+                   const UnregisterCallback&) override;
   blink::WebPushPermissionStatus GetPermissionStatus(
       const GURL& origin,
       bool user_visible) override;
   bool SupportNonVisibleMessages() override;
 
   // content_settings::Observer implementation.
   void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,
                                const ContentSettingsPattern& secondary_pattern,
                                ContentSettingsType content_type,
                                std::string resource_identifier) override;
@@ skipping 26 matching lines @@
                               int64_t service_worker_registration_id,
                               const gcm::IncomingMessage& message,
                               const base::Closure& message_handled_closure,
                               content::PushDeliveryStatus status);
 
   void DidHandleMessage(const std::string& app_id,
                         const base::Closure& completion_closure);
 
   // Subscribe methods ---------------------------------------------------------
 
-  void DoSubscribe(
-      const PushMessagingAppIdentifier& app_identifier,
-      const content::PushSubscriptionOptions& options,
-      const content::PushMessagingService::RegisterCallback& callback,
-      blink::mojom::PermissionStatus permission_status);
+  void DoSubscribe(const PushMessagingAppIdentifier& app_identifier,
+                   const content::PushSubscriptionOptions& options,
+                   const RegisterCallback& callback,
+                   blink::mojom::PermissionStatus permission_status);
 
-  void SubscribeEnd(
-      const content::PushMessagingService::RegisterCallback& callback,
-      const std::string& subscription_id,
-      const std::vector<uint8_t>& p256dh,
-      const std::vector<uint8_t>& auth,
-      content::PushRegistrationStatus status);
+  void SubscribeEnd(const RegisterCallback& callback,
+                    const std::string& subscription_id,
+                    const std::vector<uint8_t>& p256dh,
+                    const std::vector<uint8_t>& auth,
+                    content::PushRegistrationStatus status);
 
-  void SubscribeEndWithError(
-      const content::PushMessagingService::RegisterCallback& callback,
-      content::PushRegistrationStatus status);
+  void SubscribeEndWithError(const RegisterCallback& callback,
+                             content::PushRegistrationStatus status);
 
-  void DidSubscribe(
-      const PushMessagingAppIdentifier& app_identifier,
-      const std::string& sender_id,
-      const content::PushMessagingService::RegisterCallback& callback,
-      const std::string& subscription_id,
-      instance_id::InstanceID::Result result);
+  void DidSubscribe(const PushMessagingAppIdentifier& app_identifier,
+                    const std::string& sender_id,
+                    const RegisterCallback& callback,
+                    const std::string& subscription_id,
+                    instance_id::InstanceID::Result result);
 
   void DidSubscribeWithEncryptionInfo(
       const PushMessagingAppIdentifier& app_identifier,
-      const content::PushMessagingService::RegisterCallback& callback,
+      const RegisterCallback& callback,
       const std::string& subscription_id,
       const std::string& p256dh,
       const std::string& auth_secret);
 
   // GetEncryptionInfo method --------------------------------------------------
 
-  void DidGetEncryptionInfo(
-      const PushMessagingService::EncryptionInfoCallback& callback,
-      const std::string& p256dh,
-      const std::string& auth_secret) const;
+  void DidGetEncryptionInfo(const EncryptionInfoCallback& callback,
+                            const std::string& p256dh,
+                            const std::string& auth_secret) const;
 
   // Unsubscribe methods -------------------------------------------------------
 
-  void Unsubscribe(const std::string& app_id,
-                   const std::string& sender_id,
-                   const content::PushMessagingService::UnregisterCallback&);
+  // |origin|, |service_worker_registration_id| and |app_id| should be provided
+  // whenever they can be obtained. It's valid for |origin| to be empty and
+  // |service_worker_registration_id| to be kInvalidServiceWorkerRegistrationId,
+  // or for app_id to be empty, but not both at once.
+  void UnsubscribeInternal(content::PushUnregistrationReason reason,
+                           const GURL& origin,
+                           int64_t service_worker_registration_id,
+                           const std::string& app_id,
+                           const std::string& sender_id,
+                           const UnregisterCallback& callback);
+
+  void DidClearPushSubscriptionId(content::PushUnregistrationReason reason,
+                                  const std::string& app_id,
+                                  const std::string& sender_id,
+                                  const UnregisterCallback& callback);
 
   void DidDeleteID(const std::string& app_id,
                    bool was_subscribed,
-                   const content::PushMessagingService::UnregisterCallback&,
+                   const UnregisterCallback&,
                    instance_id::InstanceID::Result result);
 
-  void DidUnsubscribeInstanceID(
-      const std::string& app_id,
-      bool was_subscribed,
-      const content::PushMessagingService::UnregisterCallback&,
-      instance_id::InstanceID::Result result);
-
-  void DidUnsubscribe(bool was_subscribed,
-                      const content::PushMessagingService::UnregisterCallback&,
-                      gcm::GCMClient::Result result);
+  void DidUnsubscribe(const std::string& app_id_when_instance_id,
+                      bool was_subscribed,
+                      const UnregisterCallback& callback,
+                      content::PushUnregistrationStatus status);
 
   // OnContentSettingChanged methods -------------------------------------------
 
   void UnsubscribeBecausePermissionRevoked(
       const PushMessagingAppIdentifier& app_identifier,
-      const base::Closure& closure,
+      const UnregisterCallback& callback,
       const std::string& sender_id,
       bool success,
       bool not_found);
 
   // Helper methods ------------------------------------------------------------
 
   // Normalizes the |sender_info|. In most cases the |sender_info| will be
   // passed through to the GCM Driver as-is, but NIST P-256 application server
   // keys have to be encoded using the URL-safe variant of the base64 encoding.
   std::string NormalizeSenderInfo(const std::string& sender_info) const;
@@ skipping 52 matching lines @@
   // we can finish processing them without being interrupted.
   std::unique_ptr<ScopedKeepAlive> in_flight_keep_alive_;
 #endif
 
   base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_