Clean up RenderWidgetHostView destruction

content/browser/frame_host/render_widget_host_view_guest.cc

 // Copyright 2014 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 "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/frame_host/render_widget_host_view_guest.h"
@@ skipping 117 matching lines @@
   RenderWidgetHostViewBase* rwhv = GetGuestRenderWidgetHostView();
   gfx::Rect embedder_bounds;
   if (rwhv)
     embedder_bounds = rwhv->GetViewBounds();
   gfx::Rect shifted_rect = guest_->ToGuestRect(embedder_bounds);
   shifted_rect.set_width(size_.width());
   shifted_rect.set_height(size_.height());
   return shifted_rect;
 }
 
-void RenderWidgetHostViewGuest::RenderProcessGone(
-    base::TerminationStatus status,
-    int error_code) {
-  platform_view_->RenderProcessGone(status, error_code);
-  // Destroy the guest view instance only, so we don't end up calling
-  // platform_view_->Destroy().
-  DestroyGuestView();
-}
-
 void RenderWidgetHostViewGuest::Destroy() {
-  // The RenderWidgetHost's destruction led here, so don't call it.
-  DestroyGuestView();
+  host_->ViewDestroyed(this);
+  host_ = NULL;
+  base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 
   platform_view_->Destroy();
 }
 
 gfx::Size RenderWidgetHostViewGuest::GetPhysicalBackingSize() const {
   return RenderWidgetHostViewBase::GetPhysicalBackingSize();
 }
 
 base::string16 RenderWidgetHostViewGuest::GetSelectedText() const {
   return platform_view_->GetSelectedText();
@@ skipping 305 matching lines @@
 void RenderWidgetHostViewGuest::SetParentNativeViewAccessible(
     gfx::NativeViewAccessible accessible_parent) {
 }
 
 gfx::NativeViewId RenderWidgetHostViewGuest::GetParentForWindowlessPlugin()
     const {
   return NULL;
 }
 #endif
 
-void RenderWidgetHostViewGuest::DestroyGuestView() {
-  host_->SetView(NULL);
-  host_ = NULL;
-  base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-}
-
 bool RenderWidgetHostViewGuest::CanDispatchToConsumer(
     ui::GestureConsumer* consumer) {
   CHECK_EQ(static_cast<RenderWidgetHostViewGuest*>(consumer), this);
   return true;
 }
 
 void RenderWidgetHostViewGuest::DispatchGestureEvent(
     ui::GestureEvent* event) {
   ForwardGestureEventToRenderer(event);
 }
@@ skipping 63 matching lines @@
   return kN32_SkColorType;
 }
 
 RenderWidgetHostViewBase*
 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const {
   return static_cast<RenderWidgetHostViewBase*>(
       guest_->GetEmbedderRenderWidgetHostView());
 }
 
 }  // namespace content