Push API: Deflake PushEventEnforcesUserVisibleNotification

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"
@@ skipping 72 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 SetMessageCallbackForTesting(const base::Closure& callback);
   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,
                               const gcm::GCMClient::IncomingMessage& message,
+                              const base::Closure& message_handled_closure,
                               content::PushDeliveryStatus status);
 
   // Developers are required to display a Web Notification in response to an
   // incoming push message in order to clarify to the user that something has
   // happened in the background. When they forget to do so, display a default
   // notification on their behalf.
   void RequireUserVisibleUX(const GURL& requesting_origin,
-                            int64 service_worker_registration_id);
+                            int64 service_worker_registration_id,
+                            const base::Closure& message_handled_closure);
   void DidGetNotificationsShown(
       const GURL& requesting_origin,
       int64 service_worker_registration_id,
       bool notification_shown,
       bool notification_needed,
+      const base::Closure& message_handled_closure,
       const std::string& data,
       bool success,
       bool not_found);
 
   // Register methods ----------------------------------------------------------
 
   void RegisterEnd(
       const content::PushMessagingService::RegisterCallback& callback,
       const std::string& registration_id,
       content::PushRegistrationStatus status);
@@ skipping 32 matching lines @@
   // 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 message_callback_for_testing_;
   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_