Push API: Don't wait for network when unsubscribing

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 95 matching lines @@
 
   // KeyedService implementation.
   void Shutdown() override;
 
   // BackgroundTrigger implementation.
   base::string16 GetName() override;
   gfx::ImageSkia* GetIcon() override;
   void OnMenuClick() override;
 
   void SetMessageCallbackForTesting(const base::Closure& callback);
+  void SetUnsubscribeCallbackForTesting(const base::Closure& callback);
   void SetContentSettingChangedCallbackForTesting(
       const base::Closure& callback);
   void SetServiceWorkerUnregisteredCallbackForTesting(
       const base::Closure& callback);
 
  private:
   friend class PushMessagingBrowserTest;
   FRIEND_TEST_ALL_PREFIXES(PushMessagingServiceTest, NormalizeSenderInfo);
   FRIEND_TEST_ALL_PREFIXES(PushMessagingServiceTest, PayloadEncryptionTest);
 
@@ skipping 59 matching lines @@
                            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 DidUnregister(bool was_subscribed, gcm::GCMClient::Result result);
   void DidDeleteID(const std::string& app_id,
                    bool was_subscribed,
-                   const UnregisterCallback&,
                    instance_id::InstanceID::Result result);
-
   void DidUnsubscribe(const std::string& app_id_when_instance_id,
-                      bool was_subscribed,
-                      const UnregisterCallback& callback,
-                      content::PushUnregistrationStatus status);
+                      bool was_subscribed);
 
   // OnContentSettingChanged methods -------------------------------------------
 
   void UnsubscribeBecausePermissionRevoked(
       const PushMessagingAppIdentifier& app_identifier,
       const UnregisterCallback& callback,
       const std::string& sender_id,
       bool success,
       bool not_found);
 
@@ skipping 31 matching lines @@
       const MessageDispatchedCallback& callback) {
     message_dispatched_callback_for_testing_ = callback;
   }
 
   Profile* profile_;
 
   int push_subscription_count_;
   int pending_push_subscription_count_;
 
   base::Closure message_callback_for_testing_;
+  base::Closure unsubscribe_callback_for_testing_;
   base::Closure content_setting_changed_callback_for_testing_;
   base::Closure service_worker_unregistered_callback_for_testing_;
 
   PushMessagingNotificationManager notification_manager_;
 
   // A multiset containing one entry for each in-flight push message delivery,
   // keyed by the receiver's app id.
   std::multiset<std::string> in_flight_message_deliveries_;
 
   MessageDispatchedCallback message_dispatched_callback_for_testing_;
 
   std::unique_ptr<PushMessagingServiceObserver>
       push_messaging_service_observer_;
 
 #if BUILDFLAG(ENABLE_BACKGROUND)
   // KeepAlive registered while we have in-flight push messages, to make sure
   // 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_