Add CloseAllByProfile to NotificationUIManager and call before destroyng a Profile

chrome/browser/notifications/notification_ui_manager_mac.mm

 // 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/notification_ui_manager_mac.h"
 
 #include "base/mac/cocoa_protocols.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/notifications/notification.h"
@@ skipping 81 matching lines @@
     instance = impl = new NotificationUIManagerImpl(local_state);
   }
 
   impl->Initialize(balloons);
   balloons->set_space_change_listener(impl);
 
   return instance;
 }
 
 NotificationUIManagerMac::ControllerNotification::ControllerNotification(
-    id<CrUserNotification> a_view, Notification* a_model)
-    : view(a_view),
+    Profile* a_profile,
+    id<CrUserNotification> a_view,
+    Notification* a_model)
+    : profile(a_profile),
+      view(a_view),
       model(a_model) {
 }
 
 NotificationUIManagerMac::ControllerNotification::~ControllerNotification() {
   [view release];
   delete model;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ skipping 29 matching lines @@
     ns_notification.subtitle =
         base::SysUTF16ToNSString(notification.display_source());
     ns_notification.informativeText =
         base::SysUTF16ToNSString(notification.body());
     ns_notification.userInfo =
         [NSDictionary dictionaryWithObject:base::SysUTF8ToNSString(
             notification.notification_id())
                                     forKey:kNotificationIDKey];
     ns_notification.hasActionButton = NO;
 
-    notification_map_.insert(
-        std::make_pair(notification.notification_id(),
-            new ControllerNotification(ns_notification,
-                                       new Notification(notification))));
+    notification_map_.insert(std::make_pair(
+        notification.notification_id(),
+        new ControllerNotification(profile,
+                                   ns_notification,
+                                   new Notification(notification))));
 
     [GetNotificationCenter() deliverNotification:ns_notification];
   }
 }
 
 bool NotificationUIManagerMac::CancelById(const std::string& notification_id) {
   NotificationMap::iterator it = notification_map_.find(notification_id);
   if (it == notification_map_.end())
     return builtin_manager_->CancelById(notification_id);
 
@@ skipping 11 matching lines @@
       // references to the removed element.
       success |= RemoveNotification((it++)->second->view);
     } else {
       ++it;
     }
   }
 
   return success;
 }
 
+bool NotificationUIManagerMac::CancelAllByProfile(Profile* profile) {
+  bool success = builtin_manager_->CancelAllByProfile(profile);
+
+  for (NotificationMap::iterator it = notification_map_.begin();
+       it != notification_map_.end();) {
+    if (it->second->profile == profile) {
+      // RemoveNotification will erase from the map, invalidating iterator
+      // references to the removed element.
+      success |= RemoveNotification((it++)->second->view);
+    } else {
+      ++it;
+    }
+  }
+
+  return success;
+}
+
 void NotificationUIManagerMac::CancelAll() {
   id<CrUserNotificationCenter> center = GetNotificationCenter();
 
   // Calling RemoveNotification would loop many times over, so just replicate
   // a small bit of its logic here.
   for (NotificationMap::iterator it = notification_map_.begin();
        it != notification_map_.end();
        ++it) {
     it->second->model->Close(false);
     delete it->second;
@@ skipping 102 matching lines @@
     notification->Click();
 }
 
 - (BOOL)userNotificationCenter:(NSUserNotificationCenter*)center
      shouldPresentNotification:(id<CrUserNotification>)nsNotification {
   // Always display notifications, regardless of whether the app is foreground.
   return YES;
 }
 
 @end