Move DidReceiveServerRedirectForProvisionalLoad from RenderView to RenderFrame

content/browser/frame_host/navigator_impl.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/navigator_impl.h"
 
 #include "base/command_line.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
@@ skipping 136 matching lines @@
   // DidStartProvisionalLoadForFrame.
   // In general, we allow the view to clear the pending entry and typed URL if
   // the user requests (e.g., hitting Escape with focus in the address bar).
   // Note: don't touch the transient entry, since an interstitial may exist.
   if (controller_->GetPendingEntry() != controller_->GetVisibleEntry())
     controller_->DiscardPendingEntry();
 
   delegate_->DidFailProvisionalLoadWithError(render_frame_host, params);
 }
 
+void NavigatorImpl::DidRedirectProvisionalLoad(
+    RenderFrameHostImpl* render_frame_host,
+    int32 page_id,
+    const GURL& source_url,
+    const GURL& target_url) {
+  // TODO(creis): Remove this method and have the pre-rendering code listen to
+  // WebContentsObserver::DidGetRedirectForResourceRequest instead.
+  // See http://crbug.com/78512.
+  GURL validated_source_url(source_url);
+  GURL validated_target_url(target_url);
+  RenderProcessHost* render_process_host = render_frame_host->GetProcess();
+  render_process_host->FilterURL(false, &validated_source_url);
+  render_process_host->FilterURL(false, &validated_target_url);
+  NavigationEntry* entry;
+  if (page_id == -1) {
+    entry = controller_->GetPendingEntry();
+  } else {
+    entry = controller_->GetEntryWithPageID(render_frame_host->GetSiteInstance(),

[jam, 2014/01/10 16:19:31]

nit: 80 chars

[nasko, 2014/01/10 19:54:39]

Done.

+                                           page_id);
+  }
+  if (!entry || entry->GetURL() != validated_source_url)
+    return;
+
+  delegate_->DidRedirectProvisionalLoad(
+      render_frame_host, validated_target_url);
+}
+
 }  // namespace content