Remove persistent notifications from the database when they close.

chrome/browser/notifications/notification_ui_manager_android.cc

 // 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.
 
 #include "chrome/browser/notifications/notification_ui_manager_android.h"
 
 #include <utility>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 77 matching lines @@
 
   return true;
 }
 
 bool NotificationUIManagerAndroid::OnNotificationClosed(
     JNIEnv* env,
     jobject java_object,
     jlong persistent_notification_id,
     jstring java_origin,
     jstring java_tag) {
-  // TODO(peter): Implement handling when a notification has been closed. The
-  // notification database has to reflect this in its own state.
+  GURL origin(ConvertJavaStringToUTF8(env, java_origin));
+  std::string tag = ConvertJavaStringToUTF8(env, java_tag);
+
+  // The notification was closed by the platform, so clear all local state.
+  regenerated_notification_infos_.erase(persistent_notification_id);
+
+  // TODO(peter): Rather than assuming that the last used profile is the

[dewittj, 2015/04/10 17:18:30]

can this happen sooner rather than later?  Or do a dcheck that there is only one
profile?

[Peter Beverloo, 2015/04/20 16:47:20]

Chrome for Android only supports a single profile, if a second one were to be
introduced there would be many, many things that'd break. (Many feature don't
have the TODO either.) bauerb@ confirmed this in crbug.com/437574.

I'm not entirely sure yet about the appropriate fix - there are some privacy
concerns with storing the profile's path in the Intent extras.

In either case - yes, I agree that this is potentially fragile and can break
when somebody does try to introduce multiple profiles.

+  // appropriate one for this notification, the used profile should be
+  // stored as part of the notification's data. See https://crbug.com/437574.
+  PlatformNotificationServiceImpl::GetInstance()->OnPersistentNotificationClose(
+      ProfileManager::GetLastUsedProfile(),
+      persistent_notification_id,
+      origin);
+
   return true;
 }
 
 void NotificationUIManagerAndroid::Add(const Notification& notification,
                                        Profile* profile) {
   // If the given notification is replacing an older one, drop its associated
   // profile notification object without closing the platform notification.
   // We'll use the native Android system to perform a smoother replacement.
   ProfileNotification* notification_to_replace =
       FindNotificationToReplace(notification, profile);
@@ skipping 224 matching lines @@
   for (const auto& iterator : profile_notifications_) {
     ProfileNotification* profile_notification = iterator.second;
     if (profile_notification->notification().tag() == tag ||
         profile_notification->notification().origin_url() == origin_url ||
         profile_notification->profile() == profile) {
       return profile_notification;
     }
   }
   return nullptr;
 }