Destroy the old RenderWidgetHostView when swapping out a main frame.

content/public/test/test_renderer_host.h

Index: content/public/test/test_renderer_host.h
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h
index b9d04a20acb5d58023e334b005d496ceeececd9f..18fd37aaf25560fea6ff003867ce857673517192 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -175,10 +175,17 @@ class RenderViewHostTestEnabler {
   RenderViewHostTestEnabler();
   ~RenderViewHostTestEnabler();
 
+  void SetUp();

[Charlie Reis, 2016/12/01 23:57:26]

If only some tests need to call these, we should include a comment saying when
they're necessary.  (No need for that if it's always required.)

[lfg, 2016/12/06 22:47:04]

I've removed this and moved it to the constructor. It should be cleaner and used
by all tests that include the RenderViewHostTestEnabler.

+  void TearDown();
+
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestEnabler);
   friend class RenderViewHostTestHarness;
 
+#if defined(OS_ANDROID)
+  std::unique_ptr<MockGpuChannelEstablishFactory> gpu_channel_factory_;
+  std::unique_ptr<display::Screen> screen_;
+#endif
   std::unique_ptr<MockRenderProcessHostFactory> rph_factory_;
   std::unique_ptr<TestRenderViewHostFactory> rvh_factory_;
   std::unique_ptr<TestRenderFrameHostFactory> rfh_factory_;
@@ -280,10 +287,6 @@ class RenderViewHostTestHarness : public testing::Test {
 #if defined(USE_AURA)
   std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_;
 #endif
-#if defined(OS_ANDROID)
-  std::unique_ptr<MockGpuChannelEstablishFactory> gpu_channel_factory_;
-  std::unique_ptr<display::Screen> screen_;
-#endif
   RenderViewHostTestEnabler rvh_test_enabler_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);