Destroy the old RenderWidgetHostView when swapping out a main frame.

content/public/test/test_renderer_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/public/test/test_renderer_host.h"
 
 #include <utility>
 
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 111 matching lines @@
       RenderWidgetHostImpl::From(rvh->GetWidget());
   return host_impl->has_touch_handler();
 }
 
 
 // RenderViewHostTestEnabler --------------------------------------------------
 
 RenderViewHostTestEnabler::RenderViewHostTestEnabler()
     : rph_factory_(new MockRenderProcessHostFactory()),
       rvh_factory_(new TestRenderViewHostFactory(rph_factory_.get())),
-      rfh_factory_(new TestRenderFrameHostFactory()) {}
+      rfh_factory_(new TestRenderFrameHostFactory()) {
+#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
+#if defined(OS_MACOSX)
+  if (base::ThreadTaskRunnerHandle::IsSet())
+    ui::WindowResizeHelperMac::Get()->Init(base::ThreadTaskRunnerHandle::Get());
+#endif  // OS_MACOSX
+}
 
 RenderViewHostTestEnabler::~RenderViewHostTestEnabler() {
+#if defined(OS_MACOSX)
+  ui::WindowResizeHelperMac::Get()->ShutdownForTests();
+#endif  // OS_MACOSX
+#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 --------------------------------------------------
 
 RenderViewHostTestHarness::RenderViewHostTestHarness()
     : thread_bundle_options_(TestBrowserThreadBundle::DEFAULT) {}
 
 RenderViewHostTestHarness::~RenderViewHostTestHarness() {
 }
@@ skipping 82 matching lines @@
       ->SendFailedNavigate(entry->GetUniqueID(), false, entry->GetURL());
 }
 
 void RenderViewHostTestHarness::SetUp() {
   // ContentTestSuiteBase might have already initialized
   // MaterialDesignController in unit_tests suite.
   ui::test::MaterialDesignControllerTestAPI::Uninitialize();
   ui::MaterialDesignController::Initialize();
   thread_bundle_.reset(new TestBrowserThreadBundle(thread_bundle_options_));
 
+  rvh_test_enabler_.reset(new RenderViewHostTestEnabler);
+  if (factory_)
+    rvh_test_enabler_->rvh_factory_->set_render_process_host_factory(factory_);
+
 #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
 #if defined(USE_AURA)
   ui::ContextFactory* context_factory =
       ImageTransportFactory::GetInstance()->GetContextFactory();
 
   aura_test_helper_.reset(
       new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
   aura_test_helper_->SetUp(context_factory);
   new wm::DefaultActivationClient(aura_test_helper_->root_window());
 #endif
 
   sanity_checker_.reset(new ContentBrowserSanityChecker());
 
   DCHECK(!browser_context_);
   browser_context_.reset(CreateBrowserContext());
 
   SetContents(CreateTestWebContents());
 
   if (IsBrowserSideNavigationEnabled())
     BrowserSideNavigationSetUp();
-
-#if defined(OS_MACOSX)
-  ui::WindowResizeHelperMac::Get()->Init(base::ThreadTaskRunnerHandle::Get());
-#endif  // OS_MACOSX
 }
 
 void RenderViewHostTestHarness::TearDown() {
   if (IsBrowserSideNavigationEnabled())
     BrowserSideNavigationTearDown();
 
   SetContents(NULL);
 #if defined(USE_AURA)
   aura_test_helper_->TearDown();
   ui::TerminateContextFactoryForTests();
 #endif
   // Make sure that we flush any messages related to WebContentsImpl destruction
   // before we destroy the browser context.
   base::RunLoop().RunUntilIdle();
 
-#if defined(OS_MACOSX)
-  ui::WindowResizeHelperMac::Get()->ShutdownForTests();
-#endif  // OS_MACOSX
-
 #if defined(OS_WIN)
   ole_initializer_.reset();
 #endif
 
   // Delete any RenderProcessHosts before the BrowserContext goes away.
-  if (rvh_test_enabler_.rph_factory_)
-    rvh_test_enabler_.rph_factory_.reset();
+  if (rvh_test_enabler_->rph_factory_)
+    rvh_test_enabler_->rph_factory_.reset();
+
+  rvh_test_enabler_.reset();
 
   // Release the browser context by posting itself on the end of the task
   // queue. This is preferable to immediate deletion because it will behave
   // properly if the |rph_factory_| reset above enqueued any tasks which
   // depend on |browser_context_|.
   BrowserThread::DeleteSoon(content::BrowserThread::UI,
                             FROM_HERE,
                             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
 }
 
 BrowserContext* RenderViewHostTestHarness::CreateBrowserContext() {
   return new TestBrowserContext();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
-  rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
+  if (rvh_test_enabler_)
+    rvh_test_enabler_->rvh_factory_->set_render_process_host_factory(factory);
+  else
+    factory_ = factory;
 }
 
 }  // namespace content