Merge 68771 - Stray ++ causes crashes. Don't walk off the end of the array....

chrome/browser/notifications/notification_ui_manager.cc

 // Copyright (c) 2010 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.h"
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/notifications/balloon_collection.h"
@@ skipping 70 matching lines @@
   }
   // If it has been shown, remove it from the balloon collections.
   return balloon_collection_->RemoveById(id);
 }
 
 bool NotificationUIManager::CancelAllBySourceOrigin(const GURL& source) {
   // Same pattern as CancelById, but more complicated than the above
   // because there may be multiple notifications from the same source.
   bool removed = false;
   NotificationDeque::iterator iter;
-  for (iter = show_queue_.begin(); iter != show_queue_.end(); ++iter) {
+  for (iter = show_queue_.begin(); iter != show_queue_.end();) {
     if ((*iter)->notification().origin_url() == source) {
       iter = show_queue_.erase(iter);
       removed = true;
     } else {
       ++iter;
     }
   }
 
   return balloon_collection_->RemoveBySourceOrigin(source) || removed;
 }
@@ skipping 56 matching lines @@
 }
 
 void NotificationUIManager::Observe(NotificationType type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   if (type == NotificationType::APP_TERMINATING)
     CancelAll();
   else
     NOTREACHED();
 }