Merge 29607 - Revert r29418 as it caused a regression....

chrome/browser/renderer_host/render_widget_host_view_win.cc

Index: chrome/browser/renderer_host/render_widget_host_view_win.cc
===================================================================
--- chrome/browser/renderer_host/render_widget_host_view_win.cc	(revision 29616)
+++ chrome/browser/renderer_host/render_widget_host_view_win.cc	(working copy)
@@ -630,12 +630,6 @@
   // triggering further destructions.  The deletion of this is handled by
   // OnFinalMessage();
   close_on_deactivate_ = false;
-
-  // In case OnFinalMessage() does not get called before DestroyWindow()
-  // returns, make sure we don't try to access |render_widget_host_| later.
-  // http://crbug.com/24248
-  render_widget_host_ = NULL;
-
   DestroyWindow();
 }
 
@@ -1272,8 +1266,7 @@
 }
 
 void RenderWidgetHostViewWin::OnFinalMessage(HWND window) {
-  if (render_widget_host_)
-    render_widget_host_->ViewDestroyed();
+  render_widget_host_->ViewDestroyed();
   delete this;
 }
 
Property changes on: chrome\browser\renderer_host\render_widget_host_view_win.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/renderer_host/render_widget_host_view_win.cc:r29607