Destroy the old RenderWidgetHostView when swapping out a main frame.

chrome/browser/search/search_unittest.cc

Index: chrome/browser/search/search_unittest.cc
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index 1761130c99d8e1926462d9ce02a00d2dac8b94d9..4c0ba0b1c053cda37045ee94d2683809fc788a7a 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -44,6 +44,10 @@
 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
 #endif
 
+#if defined(OS_MACOSX)
+#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
+#endif
+
 namespace search {
 
 class SearchTest : public BrowserWithTestWindowTest {
@@ -58,6 +62,18 @@ class SearchTest : public BrowserWithTestWindowTest {
         TemplateURLServiceFactory::GetForProfile(profile());
     search_test_utils::WaitForTemplateURLServiceToLoad(template_url_service);
     SetSearchProvider(true, false);
+
+#if defined(OS_MACOSX)
+  ui::WindowResizeHelperMac::Get()->Init(base::ThreadTaskRunnerHandle::Get());

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

I'm still unclear on this one.  I think I follow the RenderViewHostTestEnabler
one, but I'm not aware of this Mac-specific code being necessary for other
navigation tests.  Is there a precedent for it?  Something specific about this
test that requires it?

If it's needed, please include a comment why.

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

I've moved this to test enabler class, since it's needed for navigation.

+#endif  // OS_MACOSX
+  }
+
+  void TearDown() override {
+#if defined(OS_MACOSX)
+    ui::WindowResizeHelperMac::Get()->ShutdownForTests();
+#endif  // OS_MACOSX
+
+    BrowserWithTestWindowTest::TearDown();
   }
 
   virtual void SetSearchProvider(bool set_ntp_url, bool insecure_ntp_url) {