Integrate the notification database with the normal code path.

chrome/browser/notifications/notification_ui_manager_android.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_NOTIFICATIONS_NOTIFICATION_UI_MANAGER_ANDROID_H_
 #define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_UI_MANAGER_ANDROID_H_
 
 #include <jni.h>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 
 class ProfileNotification;
 
 // Implementation of the Notification UI Manager for Android, which defers to
 // the Android framework for displaying notifications.
 class NotificationUIManagerAndroid : public NotificationUIManager {
  public:
   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;
   bool Update(const Notification& notification,
               Profile* profile) override;
   const Notification* FindById(const std::string& delegate_id,
                                ProfileID profile_id) const override;
   bool CancelById(const std::string& delegate_id,
                   ProfileID profile_id) override;
   std::set<std::string> GetAllIdsByProfileAndSourceOrigin(Profile* profile,
@@ skipping 21 matching lines @@
   // Returns the ProfileNotification for the |id|, or NULL if no such
   // notification is found.
   ProfileNotification* FindProfileNotification(const std::string& id) const;
 
   // Returns the ProfileNotification for |profile| that has the same origin and
   // tag as |notification|. Returns NULL if no valid match is found.
   ProfileNotification* FindNotificationToReplace(
       const Notification& notification, Profile* profile) const;
 
   // Map from a notification id to the associated ProfileNotification*.
   std::map<std::string, ProfileNotification*> profile_notifications_;

[johnme, 2015/04/08 17:33:32]

Could you maybe get rid of this now? It's not yet unused, but the remaining uses
seem vestigial?

[Peter Beverloo, 2015/04/08 18:57:48]

We still have some boilerplate code supporting non-persistent notifications. I'd
prefer to do that clean-up in another patch.

 
-  // Holds the tag of a notification, and its origin.
+  // Pair containing a regenerated 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_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationUIManagerAndroid);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_UI_MANAGER_ANDROID_H_