Integrate the notification database with the normal code path.

chrome/browser/notifications/notification_ui_manager_android.h

Index: chrome/browser/notifications/notification_ui_manager_android.h
diff --git a/chrome/browser/notifications/notification_ui_manager_android.h b/chrome/browser/notifications/notification_ui_manager_android.h
index e7681bbdbb618412375146322c0d1bf947387769..8a2a51ba5ebbabaefbee780ff0b2b7c00fdeb117 100644
--- a/chrome/browser/notifications/notification_ui_manager_android.h
+++ b/chrome/browser/notifications/notification_ui_manager_android.h
@@ -22,16 +22,19 @@ class NotificationUIManagerAndroid : public NotificationUIManager {
   NotificationUIManagerAndroid();
   ~NotificationUIManagerAndroid() override;
 
-  // Called by the Java implementation when a notification has been clicked on.
+  // Called by the Java implementation when the notification has been clicked.
   bool OnNotificationClicked(JNIEnv* env,
                              jobject java_object,
-                             jstring notification_id,
-                             jbyteArray serialized_notification_data);
+                             jlong persistent_notification_id,
+                             jstring java_origin,
+                             jstring java_tag);
 
-  // Called by the Java implementation when a notification has been closed.
+  // Called by the Java implementation when the notification has been closed.
   bool OnNotificationClosed(JNIEnv* env,
                             jobject java_object,
-                            jstring notification_id);
+                            jlong persistent_notification_id,
+                            jstring java_origin,
+                            jstring java_tag);
 
   // NotificationUIManager implementation;
   void Add(const Notification& notification, Profile* profile) override;
@@ -75,11 +78,13 @@ class NotificationUIManagerAndroid : public NotificationUIManager {
   // Map from a notification id to the associated ProfileNotification*.
   std::map<std::string, ProfileNotification*> profile_notifications_;
 
-  // Holds the tag of a notification, and its origin.
+  // Pair containing the information necessary in order to enable working with

[dewittj, 2015/04/13 18:58:53]

nit: this is only used for closing notifications (AFAICT), maybe this comment
should be more specific, like:

// ... to enable closing notifications that were not created ... We track
notifications on a best-effort basis, and may not have all notifications in this
list if they have not been interacted with since the last restart of Chrome.

[Peter Beverloo, 2015/04/14 14:09:29]

Done.

+  // notifications which were not created by this instance of the manager: the
+  // notification's origin and tag.
   using RegeneratedNotificationInfo = std::pair<std::string, std::string>;
 
-  // Map from notification id to RegeneratedNotificationInfo.
-  std::map<std::string, RegeneratedNotificationInfo>
+  // Map from persistent notification id to RegeneratedNotificationInfo.
+  std::map<int64_t, RegeneratedNotificationInfo>
       regenerated_notification_infos_;
 
   base::android::ScopedJavaGlobalRef<jobject> java_object_;