Destroy the old RenderWidgetHostView when swapping out a main frame.

chrome/test/base/browser_with_test_window_test.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 "chrome/test/base/browser_with_test_window_test.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 63 matching lines @@
 
   // Subclasses can provide their own Profile.
   profile_ = CreateProfile();
   // Subclasses can provide their own test BrowserWindow. If they return NULL
   // then Browser will create the a production BrowserWindow and the subclass
   // is responsible for cleaning it up (usually by NativeWidget destruction).
   window_.reset(CreateBrowserWindow());
 
   browser_.reset(
       CreateBrowser(profile(), browser_type_, hosted_app_, window_.get()));
+
+  rvh_test_enabler_.SetUp();
 }
 
 void BrowserWithTestWindowTest::TearDown() {
   // Some tests end up posting tasks to the DB thread that must be completed
   // before the profile can be destroyed and the test safely shut down.
   base::RunLoop().RunUntilIdle();
 
   // Reset the profile here because some profile keyed services (like the
   // audio service) depend on test stubs that the helpers below will remove.
   DestroyBrowserAndProfile();
 
   if (content::IsBrowserSideNavigationEnabled())
     content::BrowserSideNavigationTearDown();
 
 #if defined(TOOLKIT_VIEWS)
   constrained_window::SetConstrainedWindowViewsClient(nullptr);
 #endif
 
 #if defined(OS_CHROMEOS)
   ash_test_helper_->TearDown();
 #elif defined(TOOLKIT_VIEWS)
   views_test_helper_.reset();
 #endif
 
+  rvh_test_enabler_.TearDown();
+
   testing::Test::TearDown();
 
   // A Task is leaked if we don't destroy everything, then run the message
   // loop.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
   base::RunLoop().Run();
 }
 
 gfx::NativeWindow BrowserWithTestWindowTest::GetContext() {
@@ skipping 84 matching lines @@
   Browser::CreateParams params(profile);
   if (hosted_app) {
     params = Browser::CreateParams::CreateForApp(
         "Test", true /* trusted_source */, gfx::Rect(), profile);
   } else {
     params.type = browser_type;
   }
   params.window = browser_window;
   return new Browser(params);
 }