Make TestRenderWidgetHostView delete itself like the other RenderWidgetHostViews.

content/browser/renderer_host/test_render_view_host.cc

 // Copyright (c) 2012 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/renderer_host/test_render_view_host.h"
 
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/renderer_host/test_backing_store.h"
 #include "content/browser/site_instance_impl.h"
@@ skipping 46 matching lines @@
   params->security_info = std::string();
   params->gesture = NavigationGestureUser;
   params->was_within_same_page = false;
   params->is_post = false;
   params->page_state = PageState::CreateFromURL(url);
 }
 
 TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
     : rwh_(RenderWidgetHostImpl::From(rwh)),
       is_showing_(false) {
+  rwh_->SetView(this);
 }
 
 TestRenderWidgetHostView::~TestRenderWidgetHostView() {
 }
 
 RenderWidgetHost* TestRenderWidgetHostView::GetRenderWidgetHost() const {
   return NULL;
 }
 
 gfx::NativeView TestRenderWidgetHostView::GetNativeView() const {
@@ skipping 26 matching lines @@
 
 bool TestRenderWidgetHostView::IsShowing() {
   return is_showing_;
 }
 
 void TestRenderWidgetHostView::RenderViewGone(base::TerminationStatus status,
                                               int error_code) {
   delete this;
 }
 
+void TestRenderWidgetHostView::Destroy() { delete this; }
+
 gfx::Rect TestRenderWidgetHostView::GetViewBounds() const {
   return gfx::Rect();
 }
 
 BackingStore* TestRenderWidgetHostView::AllocBackingStore(
     const gfx::Size& size) {
   return new TestBackingStore(rwh_, size);
 }
 
 void TestRenderWidgetHostView::CopyFromCompositingSurface(
@@ skipping 124 matching lines @@
                          widget_delegate,
                          routing_id,
                          main_frame_routing_id,
                          swapped_out,
                          CreateSessionStorageNamespace(instance)),
       render_view_created_(false),
       delete_counter_(NULL),
       simulate_fetch_via_proxy_(false),
       simulate_history_list_was_cleared_(false),
       contents_mime_type_("text/html") {
-  // For normal RenderViewHosts, this is freed when |Shutdown()| is
-  // called.  For TestRenderViewHost, the view is explicitly
-  // deleted in the destructor below, because
-  // TestRenderWidgetHostView::Destroy() doesn't |delete this|.
-  SetView(new TestRenderWidgetHostView(this));
+  // TestRenderWidgetHostView installs itself into this->view_ in its
+  // constructor, and deletes itself when TestRenderWidgetHostView::Destroy() is
+  // called.
+  new TestRenderWidgetHostView(this);
 
   main_frame_id_ = kFrameId;
 }
 
 TestRenderViewHost::~TestRenderViewHost() {
   if (delete_counter_)
     ++*delete_counter_;
-
-  // Since this isn't a traditional view, we have to delete it.
-  delete GetView();
 }
 
 bool TestRenderViewHost::CreateRenderView(
     const string16& frame_name,
     int opener_route_id,
     int32 max_page_id) {
   DCHECK(!render_view_created_);
   render_view_created_ = true;
   return true;
 }
@@ skipping 136 matching lines @@
 
 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() {
   return static_cast<TestRenderViewHost*>(active_rvh());
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content