Add CloseAllByProfile to NotificationUIManager and call before destroyng a Profile

chrome/browser/notifications/desktop_notification_service.cc

 // Copyright (c) 2012 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/desktop_notification_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
@@ skipping 258 matching lines @@
       origin_url, title, message, icon_url, replace_id, delegate, profile);
 #endif
 }
 
 // static
 void DesktopNotificationService::RemoveNotification(
     const std::string& notification_id) {
     g_browser_process->notification_ui_manager()->CancelById(notification_id);
 }
 
-DesktopNotificationService::DesktopNotificationService(Profile* profile,
+DesktopNotificationService::DesktopNotificationService(
+    Profile* profile,
     NotificationUIManager* ui_manager)
     : profile_(profile),
       ui_manager_(ui_manager) {
   StartObserving();
 }
 
 DesktopNotificationService::~DesktopNotificationService() {
   StopObserving();
 }
 
@@ skipping 29 matching lines @@
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
       NO_RESOURCE_IDENTIFIER,
       CONTENT_SETTING_BLOCK);
 }
 
 void DesktopNotificationService::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
+  // This may get called during shutdown, so don't use GetUIManager() here,
+  // and don't do anything if ui_manager_ hasn't already been set.
+  if (!ui_manager_)
+    return;
+
   if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED) {
     // Remove all notifications currently shown or queued by the extension
-    // which was unloaded. Don't use GetUIManager() here, because this may
-    // get called during shutdown.
+    // which was unloaded.
     const extensions::Extension* extension =
         content::Details<extensions::UnloadedExtensionInfo>(details)->extension;
     if (extension &&
         g_browser_process && g_browser_process->notification_ui_manager()) {
       g_browser_process->notification_ui_manager()->
           CancelAllBySourceOrigin(extension->url());
     }
   } else if (type == chrome::NOTIFICATION_PROFILE_DESTROYED) {
+    if (g_browser_process && g_browser_process->notification_ui_manager()) {
+      g_browser_process->notification_ui_manager()->
+          CancelAllByProfile(profile_);
+    }
     StopObserving();
   }
 }
 
 ContentSetting DesktopNotificationService::GetDefaultContentSetting(
     std::string* provider_id) {
   return profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS, provider_id);
 }
 
@@ skipping 159 matching lines @@
 
   if (setting == CONTENT_SETTING_ALLOW)
     return WebKit::WebNotificationPresenter::PermissionAllowed;
   if (setting == CONTENT_SETTING_BLOCK)
     return WebKit::WebNotificationPresenter::PermissionDenied;
   if (setting == CONTENT_SETTING_ASK)
     return WebKit::WebNotificationPresenter::PermissionNotAllowed;
   NOTREACHED() << "Invalid notifications settings value: " << setting;
   return WebKit::WebNotificationPresenter::PermissionNotAllowed;
 }