Try to bandaid leaks due to TabContentsWrapper not force-closing all InfoBarDelegates on shutdown...

chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

 // Copyright (c) 2011 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/ui/tab_contents/tab_contents_wrapper.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_manager.h"
@@ skipping 159 matching lines @@
 
   renderer_preferences_util::UpdateFromSystemSettings(
       tab_contents()->GetMutableRendererPrefs(), profile());
 }
 
 TabContentsWrapper::~TabContentsWrapper() {
   in_destructor_ = true;
 
   // Destroy all remaining InfoBars.  It's important to not animate here so that
   // we guarantee that we'll delete all delegates before we do anything else.
+  //
+  // TODO(pkasting): If there is no InfoBarContainer, this leaks all the
+  // InfoBarDelegates.  This will be fixed once we call CloseSoon() directly on
+  // Infobars.
   RemoveAllInfoBars(false);
 }
 
 PropertyAccessor<TabContentsWrapper*>* TabContentsWrapper::property_accessor() {
   return g_tab_contents_wrapper_property_accessor.Pointer();
 }
 
 void TabContentsWrapper::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
                              true,
@@ skipping 164 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsWrapper implementation:
 
 void TabContentsWrapper::RenderViewCreated(RenderViewHost* render_view_host) {
   UpdateAlternateErrorPageURL(render_view_host);
 }
 
 void TabContentsWrapper::RenderViewGone() {
-  // Remove all infobars.
   RemoveAllInfoBars(true);
 
   // Tell the view that we've crashed so it can prepare the sad tab page.
   // Only do this if we're not in browser shutdown, so that TabContents
   // objects that are not in a browser (e.g., HTML dialogs) and thus are
   // visible do not flash a sad tab page.
   if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID) {
     tab_contents()->view()->OnTabCrashed(
         tab_contents()->crashed_status(), tab_contents()->crashed_error_code());
   }
@@ skipping 87 matching lines @@
 }
 
 void TabContentsWrapper::AddInfoBar(InfoBarDelegate* delegate) {
   if (!infobars_enabled_) {
     delegate->InfoBarClosed();
     return;
   }
 
   for (size_t i = 0; i < infobars_.size(); ++i) {
     if (GetInfoBarDelegateAt(i)->EqualsDelegate(delegate)) {
-      // Tell the new infobar to close so that it can clean itself up.
       delegate->InfoBarClosed();
       return;
     }
   }
 
   infobars_.push_back(delegate);
   NotificationService::current()->Notify(
       NotificationType::TAB_CONTENTS_INFOBAR_ADDED,
       Source<TabContentsWrapper>(this), Details<InfoBarDelegate>(delegate));
 
@@ skipping 161 matching lines @@
   typedef std::pair<InfoBarDelegate*, bool> RemoveDetails;
   RemoveDetails remove_details(infobar, animate);
   NotificationService::current()->Notify(
       NotificationType::TAB_CONTENTS_INFOBAR_REMOVED,
       Source<TabContentsWrapper>(this),
       Details<RemoveDetails>(&remove_details));
 
   infobars_.erase(infobars_.begin() + i);
   // Remove ourselves as an observer if we are tracking no more InfoBars.
   if (infobars_.empty()) {
-    registrar_.Remove(
-        this, NotificationType::NAV_ENTRY_COMMITTED,
+    registrar_.Remove(this, NotificationType::NAV_ENTRY_COMMITTED,
         Source<NavigationController>(&tab_contents_->controller()));
   }
 }
 
 void TabContentsWrapper::RemoveAllInfoBars(bool animate) {
   while (!infobars_.empty())
     RemoveInfoBarInternal(GetInfoBarDelegateAt(infobar_count() - 1), animate);
 }