Add SwappedOut to TabContentsDelegate to allow us to correctly delete TabContents.

content/browser/tab_contents/tab_contents.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 "content/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 1627 matching lines @@
   if (view()->IsDoingDrag()) {
     view()->CancelDragAndCloseTab();
     return;
   }
 
   // Ignore this if it comes from a RenderViewHost that we aren't showing.
   if (delegate() && rvh == render_view_host())
     delegate()->CloseContents(this);
 }
 
+void TabContents::SwappedOut(RenderViewHost* rvh) {
+  if (delegate() && rvh == render_view_host())

[Charlie Reis, 2011/11/11 22:23:52]

You're seeing the current RenderViewHost send a swapped out message?  That
sounds like a race bug that we should be handling differently.  The current RVH
should never be swapped out.

+    delegate()->SwappedOut(this);
+}
+
 void TabContents::RequestMove(const gfx::Rect& new_bounds) {
   if (delegate() && delegate()->IsPopupOrPanel(this))
     delegate()->MoveContents(this, new_bounds);
 }
 
 void TabContents::DidStartLoading() {
   SetIsLoading(true, NULL);
 
   if (delegate() && content_restrictions_) {
       content_restrictions_ = 0;
@@ skipping 357 matching lines @@
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
   rwh_view->SetSize(view()->GetContainerSize());
 }
 
 bool TabContents::GotResponseToLockMouseRequest(bool allowed) {
   return render_view_host() ?
       render_view_host()->GotResponseToLockMouseRequest(allowed) : false;
 }