When an extension is uninstalled, close all desktop notifications from that e...

chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc

Index: chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc
===================================================================
--- chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc	(revision 65581)
+++ chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc	(working copy)
@@ -24,33 +24,24 @@
   virtual void SetActiveView(BalloonViewImpl* view) {}
 };
 
-MockBalloonCollection::MockBalloonCollection()
-    : log_proxy_(new LoggingNotificationProxy()) {
+MockBalloonCollection::MockBalloonCollection() {
   set_notification_ui(new MockNotificationUI());
 }
 
 void MockBalloonCollection::Add(const Notification& notification,
                                 Profile* profile) {
-  // Swap in the logging proxy for the purpose of logging calls that
+  // Swap in a logging proxy for the purpose of logging calls that
   // would be made into javascript, then pass this down to the
   // balloon collection.
-  Notification test_notification(notification.origin_url(),
-                                 notification.content_url(),
-                                 notification.display_source(),
-                                 string16(), /* replace_id */
-                                 log_proxy_.get());
+  Notification test_notification(
+      notification.origin_url(),
+      notification.content_url(),
+      notification.display_source(),
+      notification.replace_id(),
+      new LoggingNotificationProxy(notification.notification_id()));

[oshima, 2010/11/11 19:00:17]

who deletes this object now?

[John Gregg, 2010/11/11 23:17:46]

It's still a scoped_refptr in Notification.  Now it has no other references, so
when Notification is destroyed it is destroyed.

   BalloonCollectionImpl::Add(test_notification, profile);
 }
 
-bool MockBalloonCollection::Remove(const Notification& notification) {
-  Notification test_notification(notification.origin_url(),
-                                 notification.content_url(),
-                                 notification.display_source(),
-                                 string16(), /* replace_id */
-                                 log_proxy_.get());
-  return BalloonCollectionImpl::Remove(test_notification);
-}
-
 Balloon* MockBalloonCollection::MakeBalloon(const Notification& notification,
                                             Profile* profile) {
   // Start with a normal balloon but mock out the view.