Push API: Forced notifications should use Notifications database

chrome/browser/push_messaging/push_messaging_service_impl.h

Index: chrome/browser/push_messaging/push_messaging_service_impl.h
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h
index 2a4ed65949c8c60b9d7a6d8a28ce525a790e448e..e76e8d2fb85204557a3df7c430b6d7a6763a1337 100644
--- a/chrome/browser/push_messaging/push_messaging_service_impl.h
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.h
@@ -20,8 +20,9 @@
 class Profile;
 class PushMessagingApplicationId;
 
-namespace user_prefs {
-class PrefRegistrySyncable;
+namespace content {
+struct NotificationDatabaseData;
+struct PlatformNotificationData;
 }
 
 namespace gcm {
@@ -29,6 +30,10 @@ class GCMDriver;
 class GCMProfileService;
 }
 
+namespace user_prefs {
+class PrefRegistrySyncable;
+}
+
 class PushMessagingServiceImpl : public content::PushMessagingService,
                                  public gcm::GCMAppHandler,
                                  public content_settings::Observer,
@@ -115,6 +120,22 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
   void RequireUserVisibleUX(const GURL& requesting_origin,
                             int64 service_worker_registration_id,
                             const base::Closure& message_handled_closure);
+
+  static void DidGetNotificationsShowingIOProxy(

[Peter Beverloo, 2015/04/30 11:11:42]

Since they're not being explicitly tested by anything, these methods could be
file-private anonymous functions.

[johnme, 2015/04/30 13:30:12]

Sadly not, as they post to private methods of PMSI (that I'd rather not make
public).

+      const base::WeakPtr<PushMessagingServiceImpl>& ui_weak_ptr,
+      const GURL& requesting_origin,
+      int64 service_worker_registration_id,

[Peter Beverloo, 2015/04/30 11:11:42]

int64 -> int64_t

[johnme, 2015/04/30 13:30:12]

Done (ditto elsewhere that this patch touches).

+      const base::Closure& message_handled_closure,
+      bool success,
+      const std::vector<content::NotificationDatabaseData>& data);
+
+  void DidGetNotificationsShowing(

[Peter Beverloo, 2015/04/30 11:11:42]

Perhaps "DidGetNotificationsFromDatabase" would be clearer, since having both
"DidGetNotificationsShow{n,ing}" is ambiguous.

[johnme, 2015/04/30 13:30:12]

Done (I also renamed DidGetNotificationsShown to
DidGetNotificationsShownAndNeeded).

+      const GURL& requesting_origin,
+      int64 service_worker_registration_id,
+      const base::Closure& message_handled_closure,
+      bool success,
+      const std::vector<content::NotificationDatabaseData>& data);
+
   void DidGetNotificationsShown(
       const GURL& requesting_origin,
       int64 service_worker_registration_id,
@@ -125,6 +146,21 @@ class PushMessagingServiceImpl : public content::PushMessagingService,
       bool success,
       bool not_found);
 
+  static void DidWriteNotificationDataIOProxy(
+      const base::WeakPtr<PushMessagingServiceImpl>& ui_weak_ptr,
+      const GURL& requesting_origin,
+      const content::PlatformNotificationData& notification_data,
+      const base::Closure& message_handled_closure,
+      bool success,
+      int64_t persistent_notification_id);
+
+  void DidWriteNotificationData(
+      const GURL& requesting_origin,
+      const content::PlatformNotificationData& notification_data,
+      const base::Closure& message_handled_closure,
+      bool success,
+      int64_t persistent_notification_id);
+
   // Register methods ----------------------------------------------------------
 
   void RegisterEnd(