Move DidReceiveServerRedirectForProvisionalLoad from RenderView to RenderFrame

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b25589a94189fd21f89e11ca6bdd2f3293c3286c..1eec5c3954041119e77bf4c3b161ad76eefa0152 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2176,7 +2176,7 @@ void WebContentsImpl::DidStartProvisionalLoad(
         WebContentsObserver,
         observers_,
         ProvisionalChangeToMainFrameUrl(validated_url,
-                                        render_frame_host->render_view_host()));
+                                        render_frame_host));
   }
 }
 
@@ -2202,33 +2202,14 @@ void WebContentsImpl::NotifyChangedNavigationState(
 }
 
 void WebContentsImpl::DidRedirectProvisionalLoad(
-    RenderViewHost* render_view_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_view_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_view_host->GetSiteInstance(),
-                                           page_id);
-  }
-  if (!entry || entry->GetURL() != validated_source_url)
-    return;
-
+    RenderFrameHostImpl* render_frame_host,
+    const GURL& validated_target_url) {
   // Notify observers about the provisional change in the main frame URL.
-  FOR_EACH_OBSERVER(WebContentsObserver, observers_,
-                    ProvisionalChangeToMainFrameUrl(validated_target_url,
-                                                    render_view_host));
+  FOR_EACH_OBSERVER(
+      WebContentsObserver,
+      observers_,
+      ProvisionalChangeToMainFrameUrl(validated_target_url,
+                                      render_frame_host));
 }
 
 void WebContentsImpl::OnDidLoadResourceFromMemoryCache(