Move ClosePage() from RenderViewHost to WebContents.

content/browser/web_contents/web_contents_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/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 663 matching lines @@
   if (!GetRenderViewHost())
     return MSG_ROUTING_NONE;
 
   return GetRenderViewHost()->GetRoutingID();
 }
 
 int WebContentsImpl::GetFullscreenWidgetRoutingID() const {
   return fullscreen_widget_routing_id_;
 }
 
+void WebContentsImpl::ClosePage() {
+  static_cast<RenderViewHostImpl*>(GetRenderViewHost())->ClosePage();

[Charlie Reis, 2015/04/21 17:28:08]

GetRenderViewHostImpl() would take care of the cast for you.

(I may do another CL after this to kill GetRenderViewHostImpl and just make
GetRenderViewHost have a covariant return type, but no need to do that here.)

[nasko, 2015/04/29 17:09:27]

Thank you!

+}
+
 RenderWidgetHostView* WebContentsImpl::GetRenderWidgetHostView() const {
   return GetRenderManager()->GetRenderWidgetHostView();
 }
 
 RenderWidgetHostView* WebContentsImpl::GetFullscreenRenderWidgetHostView()
     const {
   RenderWidgetHost* const widget_host =
       RenderWidgetHostImpl::FromID(GetRenderProcessHost()->GetID(),
                                    GetFullscreenWidgetRoutingID());
   return widget_host ? widget_host->GetView() : NULL;
@@ skipping 3302 matching lines @@
 void WebContentsImpl::UpdateEncoding(RenderFrameHost* render_frame_host,
                                      const std::string& encoding) {
   SetEncoding(encoding);
 }
 
 void WebContentsImpl::DocumentAvailableInMainFrame(
     RenderViewHost* render_view_host) {
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DocumentAvailableInMainFrame());
 }
 void WebContentsImpl::RouteCloseEvent(RenderViewHost* rvh) {

[Charlie Reis, 2015/04/21 17:28:08]

nit: Blank line before, as long as we're changing this method.

[nasko, 2015/04/29 17:09:27]

Done.

   // Tell the active RenderViewHost to run unload handlers and close, as long
   // as the request came from a RenderViewHost in the same BrowsingInstance.
   // In most cases, we receive this from a swapped out RenderViewHost.
   // It is possible to receive it from one that has just been swapped in,
   // in which case we might as well deliver the message anyway.
   if (rvh->GetSiteInstance()->IsRelatedSiteInstance(GetSiteInstance()))
-    GetRenderViewHost()->ClosePage();
+    ClosePage();
 }
 
 bool WebContentsImpl::ShouldRouteMessageEvent(
     RenderFrameHost* target_rfh,
     SiteInstance* source_site_instance) const {
   // Allow the message if this WebContents is dedicated to a browser plugin
   // guest.
   // Note: This check means that an embedder could theoretically receive a
   // postMessage from anyone (not just its own guests). However, this is
   // probably not a risk for apps since other pages won't have references
@@ skipping 513 matching lines @@
   node->render_manager()->ResumeResponseDeferredAtStart();
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content