Move DidFailProvisionalLoad handling from RenderView(Host) to RenderFrame(Host).

content/browser/frame_host/render_frame_host_manager.cc

 // Copyright 2013 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/frame_host/render_frame_host_manager.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 334 matching lines @@
   // Notify all swapped out hosts, including the pending RVH.
   for (RenderFrameHostMap::iterator iter = swapped_out_hosts_.begin();
        iter != swapped_out_hosts_.end();
        ++iter) {
     DCHECK_NE(iter->second->render_view_host()->GetSiteInstance(),
               current_host()->GetSiteInstance());
     iter->second->render_view_host()->DisownOpener();
   }
 }
 
-void RenderFrameHostManager::RendererAbortedProvisionalLoad(
-    RenderViewHost* render_view_host) {
-  // We used to cancel the pending renderer here for cross-site downloads.
-  // However, it's not safe to do that because the download logic repeatedly
-  // looks for this WebContents based on a render view ID.  Instead, we just
-  // leave the pending renderer around until the next navigation event
-  // (Navigate, DidNavigate, etc), which will clean it up properly.

[Charlie Reis, 2014/01/06 18:13:35]

While it makes sense to remove this method, I think we want to keep the first
part of this comment in the call site (NavigatorImpl).  It's another thing that
needs to be fixed, but not in this CL.

[nasko, 2014/01/06 18:47:03]

Done.

-  // TODO(creis): All of this will go away when we move the cross-site logic
-  // to ResourceDispatcherHost, so that we intercept responses rather than
-  // navigation events.  (That's necessary to support onunload anyway.)  Once
-  // we've made that change, we won't create a pending renderer until we know
-  // the response is not a download.

[Charlie Reis, 2014/01/06 18:13:35]

This is an ancient TODO from 2008, when I was loosely planning to move all the
swapping logic to the equivalent of CSRH.  I think we're planning to keep the
logic where it is for browser-initiated navigations (including typed URLs to
cross-site downloads), so let's go ahead and remove the TODO.

Perhaps we should replace it with a simpler:
TODO(creis): Find a way to cancel any pending RFH here.

[nasko, 2014/01/06 18:47:03]

Done.

-}
-
 void RenderFrameHostManager::RendererProcessClosing(
     RenderProcessHost* render_process_host) {
   // Remove any swapped out RVHs from this process, so that we don't try to
   // swap them back in while the process is exiting.  Start by finding them,
   // since there could be more than one.
   std::list<int> ids_to_remove;
   for (RenderFrameHostMap::iterator iter = swapped_out_hosts_.begin();
        iter != swapped_out_hosts_.end();
        ++iter) {
     if (iter->second->GetProcess() == render_process_host)
@@ skipping 931 matching lines @@
     SiteInstance* instance) const {
   RenderFrameHostMap::const_iterator iter =
       swapped_out_hosts_.find(instance->GetId());
   if (iter != swapped_out_hosts_.end())
     return iter->second;
 
   return NULL;
 }
 
 }  // namespace content