Add CloseAllByProfile to NotificationUIManager and call before destroyng a Profile

chrome/browser/notifications/notification_ui_manager_impl.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/notification_ui_manager_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 106 matching lines @@
       iter = show_queue_.erase(iter);
       removed = true;
     } else {
       ++iter;
     }
   }
 
   return balloon_collection_->RemoveBySourceOrigin(source) || removed;
 }
 
+bool NotificationUIManagerImpl::CancelAllByProfile(Profile* profile) {
+  // Same pattern as CancelAllBySourceOrigin.
+  bool removed = false;

[oshima, 2012/11/29 02:21:50]

is it ok to say
bool removed = balloon_collection_->RemoveByProfile(profile);

and just do
return removed?

[stevenjb, 2012/11/29 02:52:25]

No, we set it in the for loop also. Should be clearer now.

[oshima, 2012/11/29 16:57:48]

I think you can because the loop changes the value only from
false to true, unless there is order dependency. Not big deal and
I'll leave it to you.

+  NotificationDeque::iterator iter;
+  for (iter = show_queue_.begin(); iter != show_queue_.end();) {

[oshima, 2012/11/29 02:21:50]

Move the iter def into for, or if you want to keep it outside, then the
following would be a little bit better.

NotificationDeque::iterator iter = show_queue.begin();
while (iter != show_queue_.end()) {
}

[stevenjb, 2012/11/29 02:52:25]

I didn't write these iterators, I just copy/pasted them.
Now you've convinced me to fix them all :P
(But I found an pointless copy in the process, so maybe worth it)

+    if ((*iter)->profile() == profile) {
+      iter = show_queue_.erase(iter);
+      removed = true;
+    } else {
+      ++iter;
+    }
+  }
+
+  return balloon_collection_->RemoveByProfile(profile) || removed;
+}
+
 void NotificationUIManagerImpl::CancelAll() {
   STLDeleteElements(&show_queue_);
   balloon_collection_->RemoveAll();
 }
 
 BalloonCollection* NotificationUIManagerImpl::balloon_collection() {
   return balloon_collection_.get();
 }
 
 NotificationPrefsManager* NotificationUIManagerImpl::prefs_manager() {
@@ skipping 106 matching lines @@
   } else {
     NOTREACHED();
   }
 }
 
 void NotificationUIManagerImpl::OnDesktopNotificationPositionChanged() {
   balloon_collection_->SetPositionPreference(
       static_cast<BalloonCollection::PositionPreference>(
           position_pref_.GetValue()));
 }