Remove persistent notifications from the database when they close.

chrome/browser/notifications/platform_notification_service_impl.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/platform_notification_service_impl.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_event_dispatcher.h"
+#include "content/public/browser/platform_notification_context.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/common/platform_notification_data.h"
 #include "net/base/net_util.h"
 #include "ui/message_center/notifier_settings.h"
 #include "url/url_constants.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/strings/string_number_conversions.h"
 #endif
 
+using content::BrowserContext;
 using content::BrowserThread;
+using content::PlatformNotificationContext;
 using message_center::NotifierId;
 
 namespace {
 
+// Callback to provide when deleting the data associated with persistent Web
+// Notifications from the notification database.
+void OnPersistentNotificationDataDeleted(bool success) {
+  // TODO(peter): Record UMA for notification deletion requests created by the
+  // PlatformNotificationService.
+}
+
 void CancelNotification(const std::string& id, ProfileID profile_id) {
   PlatformNotificationServiceImpl::GetInstance()
       ->GetNotificationUIManager()->CancelById(id, profile_id);
 }
 
 }  // namespace
 
 // static
 PlatformNotificationServiceImpl*
 PlatformNotificationServiceImpl::GetInstance() {
   return Singleton<PlatformNotificationServiceImpl>::get();
 }
 
 PlatformNotificationServiceImpl::PlatformNotificationServiceImpl()
     : notification_ui_manager_for_tests_(nullptr) {}
 
 PlatformNotificationServiceImpl::~PlatformNotificationServiceImpl() {}
 
 void PlatformNotificationServiceImpl::OnPersistentNotificationClick(
-    content::BrowserContext* browser_context,
+    BrowserContext* browser_context,
     int64_t persistent_notification_id,
     const GURL& origin,
     const base::Callback<void(content::PersistentNotificationStatus)>&
         callback) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::NotificationEventDispatcher::GetInstance()
       ->DispatchNotificationClickEvent(
             browser_context,
             persistent_notification_id,
             origin,
             callback);
 }
 
+void PlatformNotificationServiceImpl::OnPersistentNotificationClose(
+    BrowserContext* browser_context,
+    int64_t persistent_notification_id,
+    const GURL& origin) const {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  PlatformNotificationContext* context =
+      BrowserContext::GetStoragePartitionForSite(browser_context, origin)
+          ->GetPlatformNotificationContext();
+
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&PlatformNotificationContext::DeleteNotificationData,
+                 base::Unretained(context),

[johnme, 2015/04/10 11:54:39]

This doesn't look safe. Possible solution: move the RefCountedThreadSafe from
PlatformNotificationContextImpl to PlatformNotificationContext, being careful to
preserve what thread it gets deleted on.

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

Other classes hanging off of StoragePartition use this strategy (see
IndexedDbContext(Impl) and NavigatorConnectContext(Impl)

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

Done.

+                 persistent_notification_id,
+                 origin,
+                 base::Bind(&OnPersistentNotificationDataDeleted)));
+}
+
 blink::WebNotificationPermission
 PlatformNotificationServiceImpl::CheckPermissionOnUIThread(
-    content::BrowserContext* browser_context,
+    BrowserContext* browser_context,
     const GURL& origin,
     int render_process_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
 #if defined(ENABLE_EXTENSIONS)
   // Extensions support an API permission named "notification". This will grant
   // not only grant permission for using the Chrome App extension API, but also
@@ skipping 89 matching lines @@
 
   if (setting == CONTENT_SETTING_ALLOW)
     return blink::WebNotificationPermissionAllowed;
   if (setting == CONTENT_SETTING_BLOCK)
     return blink::WebNotificationPermissionDenied;
 
   return blink::WebNotificationPermissionDefault;
 }
 
 void PlatformNotificationServiceImpl::DisplayNotification(
-    content::BrowserContext* browser_context,
+    BrowserContext* browser_context,
     const GURL& origin,
     const SkBitmap& icon,
     const content::PlatformNotificationData& notification_data,
     scoped_ptr<content::DesktopNotificationDelegate> delegate,
     base::Closure* cancel_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
   NotificationObjectProxy* proxy = new NotificationObjectProxy(delegate.Pass());
   Notification notification = CreateNotificationFromData(
       profile, origin, icon, notification_data, proxy);
 
   GetNotificationUIManager()->Add(notification, profile);
   if (cancel_callback)
     *cancel_callback =
         base::Bind(&CancelNotification,
                    notification.delegate_id(),
                    NotificationUIManager::GetProfileID(profile));
 
   profile->GetHostContentSettingsMap()->UpdateLastUsage(
       origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 void PlatformNotificationServiceImpl::DisplayPersistentNotification(
-    content::BrowserContext* browser_context,
+    BrowserContext* browser_context,
     int64_t persistent_notification_id,
     const GURL& origin,
     const SkBitmap& icon,
     const content::PlatformNotificationData& notification_data) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
   PersistentNotificationDelegate* delegate = new PersistentNotificationDelegate(
       browser_context, persistent_notification_id, origin);
 
   Notification notification = CreateNotificationFromData(
       profile, origin, icon, notification_data, delegate);
 
   // TODO(peter): Remove this mapping when we have reliable id generation for
   // the message_center::Notification objects.
   persistent_notifications_[persistent_notification_id] = notification.id();
 
   GetNotificationUIManager()->Add(notification, profile);
 
   profile->GetHostContentSettingsMap()->UpdateLastUsage(
       origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 void PlatformNotificationServiceImpl::ClosePersistentNotification(
-    content::BrowserContext* browser_context,
+    BrowserContext* browser_context,
     int64_t persistent_notification_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
   auto iter = persistent_notifications_.find(persistent_notification_id);
   if (iter == persistent_notifications_.end()) {
 #if defined(OS_ANDROID)
     // TODO(peter): Remove this conversion when the notification ids are being
@@ skipping 91 matching lines @@
       formatted_origin.push_back(':');
       formatted_origin.append(base::UTF8ToUTF16(origin.port()));
     }
     return formatted_origin;
   }
 
   // TODO(dewittj): Once file:// URLs are passed in to the origin
   // GURL here, begin returning the path as the display name.
   return net::FormatUrl(origin, languages);
 }