WebUI: Fix lifecycle-bug when RenderFrameHost is swapped out

content/browser/webui/web_ui_impl.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/browser/webui/web_ui_impl.h"
 
 #include <stddef.h>
 
 #include "base/debug/dump_without_crashing.h"
 #include "base/json/json_writer.h"
@@ skipping 82 matching lines @@
                                  bool was_main_frame) {
   if (was_main_frame) {
     GURL site_url = render_view_host->GetSiteInstance()->GetSiteURL();
     GetContentClient()->browser()->LogWebUIUrl(site_url);
   }
 
   for (WebUIMessageHandler* handler : handlers_)
     handler->RenderViewReused();
 }
 
+void WebUIImpl::RenderFrameHostSwappingOut() {
+  for (WebUIMessageHandler* handler : handlers_)
+    handler->RenderFrameHostSwappingOut();

[Dan Beam, 2016/06/06 23:41:46]

why wouldn't we just call DisallowJavascript() directly here and skip changing
the /public/ API?

[tommycli, 2016/06/07 17:46:07]

Done.

+}
+
 WebContents* WebUIImpl::GetWebContents() const {
   return web_contents_;
 }
 
 float WebUIImpl::GetDeviceScaleFactor() const {
   return GetScaleFactorForView(web_contents_->GetRenderWidgetHostView());
 }
 
 const base::string16& WebUIImpl::GetOverriddenTitle() const {
   return overridden_title_;
@@ skipping 156 matching lines @@
 }
 
 void WebUIImpl::AddToSetIfFrameNameMatches(
     std::set<RenderFrameHost*>* frame_set,
     RenderFrameHost* host) {
   if (host->GetFrameName() == frame_name_)
     frame_set->insert(host);
 }
 
 }  // namespace content