Deflake PushMessagingBrowserTest.DenyPushPermissionUnregisters & friends

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 "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/push_messaging_service.h"
 #include "content/public/common/push_messaging_status.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h"
@@ skipping 62 matching lines @@
 
   // content_settings::Observer implementation.
   void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,
                                const ContentSettingsPattern& secondary_pattern,
                                ContentSettingsType content_type,
                                std::string resource_identifier) override;
 
   // KeyedService implementation.
   void Shutdown() override;
 
+  void SetContentSettingChangedCallbackForTesting(
+      const base::Closure& callback);
+
  private:
   // A registration is pending until it has succeeded or failed.
   void IncreasePushRegistrationCount(int add, bool is_pending);
   void DecreasePushRegistrationCount(int subtract, bool was_pending);
 
   // OnMessage methods ---------------------------------------------------------
 
   void DeliverMessageCallback(const std::string& app_id_guid,
                               const GURL& requesting_origin,
                               int64 service_worker_registration_id,
@@ skipping 40 matching lines @@
                   const std::string& sender_id,
                   const content::PushMessagingService::UnregisterCallback&);
 
   void DidUnregister(bool was_registered,
                      const content::PushMessagingService::UnregisterCallback&,
                      gcm::GCMClient::Result result);
 
   // OnContentSettingChanged methods -------------------------------------------
 
   void UnregisterBecausePermissionRevoked(const PushMessagingApplicationId& id,
+                                          const base::Closure& closure,
                                           const std::string& sender_id,
                                           bool success, bool not_found);
 
   // Helper methods ------------------------------------------------------------
 
   // Checks if a given origin is allowed to use Push.
   bool HasPermission(const GURL& origin);
 
   gcm::GCMDriver* GetGCMDriver() const;
 
   Profile* profile_;
 
   int push_registration_count_;
   int pending_push_registration_count_;
 
+  base::Closure content_setting_changed_callback_for_testing_;
+
   base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_