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 62 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
+  // 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) {
   JNIEnv* env = AttachCurrentThread();
 
   // The Android notification UI manager only supports Web Notifications, which
   // have a PersistentNotificationDelegate. The persistent id of the
   // notification is exposed through it's interface.
@@ skipping 105 matching lines @@
   return false;
 }
 
 void NotificationUIManagerAndroid::CancelAll() {
   NOTREACHED();
 }
 
 bool NotificationUIManagerAndroid::RegisterNotificationUIManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }