Destroy the old RenderWidgetHostView when swapping out a main frame.

content/public/test/test_renderer_host.cc

Index: content/public/test/test_renderer_host.cc
diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc
index 6817a5a0ac6e40a6008973d12b39e46571055ffb..cabda89cf31375ab94f57c8197595f5d017beb35 100644
--- a/content/public/test/test_renderer_host.cc
+++ b/content/public/test/test_renderer_host.cc
@@ -134,6 +134,34 @@ RenderViewHostTestEnabler::RenderViewHostTestEnabler()
 RenderViewHostTestEnabler::~RenderViewHostTestEnabler() {
 }
 
+void RenderViewHostTestEnabler::SetUp() {
+#if !defined(OS_ANDROID)
+  ImageTransportFactory::InitializeForUnitTests(
+      base::WrapUnique(new NoTransportImageTransportFactory));
+#else
+  gpu_channel_factory_ = base::MakeUnique<MockGpuChannelEstablishFactory>();
+  ContextProviderFactoryImpl::Initialize(gpu_channel_factory_.get());
+  ui::ContextProviderFactory::SetInstance(
+      ContextProviderFactoryImpl::GetInstance());
+  if (!screen_)
+    screen_.reset(ui::CreateDummyScreenAndroid());
+  display::Screen::SetScreenInstance(screen_.get());
+#endif
+}
+
+void RenderViewHostTestEnabler::TearDown() {
+#if !defined(OS_ANDROID)
+  // RenderWidgetHostView holds on to a reference to SurfaceManager, so it
+  // must be shut down before the ImageTransportFactory.
+  ImageTransportFactory::Terminate();
+#else
+  display::Screen::SetScreenInstance(nullptr);
+  ui::ContextProviderFactory::SetInstance(nullptr);
+  ContextProviderFactoryImpl::Terminate();
+  gpu_channel_factory_.reset();
+#endif
+}
+
 
 // RenderViewHostTestHarness --------------------------------------------------
 
@@ -237,18 +265,9 @@ void RenderViewHostTestHarness::SetUp() {
 #if defined(OS_WIN)
   ole_initializer_.reset(new ui::ScopedOleInitializer());
 #endif
-#if !defined(OS_ANDROID)
-  ImageTransportFactory::InitializeForUnitTests(
-      base::WrapUnique(new NoTransportImageTransportFactory));
-#else
-  gpu_channel_factory_ = base::MakeUnique<MockGpuChannelEstablishFactory>();
-  ContextProviderFactoryImpl::Initialize(gpu_channel_factory_.get());
-  ui::ContextProviderFactory::SetInstance(
-      ContextProviderFactoryImpl::GetInstance());
-  if (!screen_)
-    screen_.reset(ui::CreateDummyScreenAndroid());
-  display::Screen::SetScreenInstance(screen_.get());
-#endif
+
+  rvh_test_enabler_.SetUp();
+
 #if defined(USE_AURA)
   ui::ContextFactory* context_factory =
       ImageTransportFactory::GetInstance()->GetContextFactory();
@@ -308,16 +327,7 @@ void RenderViewHostTestHarness::TearDown() {
                             browser_context_.release());
   thread_bundle_.reset();
 
-#if !defined(OS_ANDROID)
-    // RenderWidgetHostView holds on to a reference to SurfaceManager, so it
-    // must be shut down before the ImageTransportFactory.
-    ImageTransportFactory::Terminate();
-#else
-  display::Screen::SetScreenInstance(nullptr);
-  ui::ContextProviderFactory::SetInstance(nullptr);
-  ContextProviderFactoryImpl::Terminate();
-  gpu_channel_factory_.reset();
-#endif
+  rvh_test_enabler_.TearDown();
 }
 
 BrowserContext* RenderViewHostTestHarness::CreateBrowserContext() {