Integrate the notification database with the normal code path.

chrome/browser/notifications/persistent_notification_delegate.h

Index: chrome/browser/notifications/persistent_notification_delegate.h
diff --git a/chrome/browser/notifications/persistent_notification_delegate.h b/chrome/browser/notifications/persistent_notification_delegate.h
index 28e9420051033cee3040385fbb8d80bdf29b4b0d..2c5b1c54bf1d68526d4f7ac25cb9b70da5b1d93e 100644
--- a/chrome/browser/notifications/persistent_notification_delegate.h
+++ b/chrome/browser/notifications/persistent_notification_delegate.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_NOTIFICATIONS_PERSISTENT_NOTIFICATION_DELEGATE_H_
 #define CHROME_BROWSER_NOTIFICATIONS_PERSISTENT_NOTIFICATION_DELEGATE_H_
 
+#include <stdint.h>

[Avi (use Gerrit), 2015/03/31 20:36:21]

Thank you!

 #include <string>
 
 #include "chrome/browser/notifications/notification_delegate.h"
-#include "content/public/common/platform_notification_data.h"
 #include "url/gurl.h"
 
 namespace content {
@@ -22,16 +22,11 @@ class PersistentNotificationDelegate : public NotificationDelegate {
  public:
   PersistentNotificationDelegate(
       content::BrowserContext* browser_context,
-      int64 service_worker_registration_id,
-      const GURL& origin,
-      const content::PlatformNotificationData& notification_data);
+      int64_t persistent_notification_id,
+      const GURL& origin);
 
-  int64 service_worker_registration_id() const {
-    return service_worker_registration_id_;
-  }
-
-  const content::PlatformNotificationData& notification_data() const {
-    return notification_data_;
+  int64 persistent_notification_id() const {

[Avi (use Gerrit), 2015/03/31 20:36:21]

int64_t

[johnme, 2015/04/01 17:39:37]

What's the relation between this and id()? Could id() just be
base::Int64ToString(persistent_notification_id_) ? If you can't unify these,
please clearly document their different purposes.

[Peter Beverloo, 2015/04/01 18:32:17]

Done.

[Peter Beverloo, 2015/04/01 18:32:17]

id() is what we tell the NotificationUIManager (on desktop the Message Center),
p_n_id() is the reference for the NotificationDatabase. Theoretically we can
unify them, but I'd rather not touch that area in this patch. Added a comment.

+    return persistent_notification_id_;
   }
 
   // NotificationDelegate implementation.
@@ -45,9 +40,8 @@ class PersistentNotificationDelegate : public NotificationDelegate {
 
  private:
   content::BrowserContext* browser_context_;
-  int64 service_worker_registration_id_;
+  int64_t persistent_notification_id_;
   GURL origin_;
-  content::PlatformNotificationData notification_data_;
 
   std::string id_;
 };