Move DidReceiveServerRedirectForProvisionalLoad from RenderView to RenderFrame

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/debug/trace_event.h"
@@ skipping 2184 matching lines @@
                              params.error_description,
                              render_frame_host->render_view_host()));
 }
 
 void WebContentsImpl::NotifyChangedNavigationState(
     InvalidateTypes changed_flags) {
   NotifyNavigationStateChanged(changed_flags);
 }
 
 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->render_view_host()));

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

it looks like none of the overrides for this method actually use the
renderviewhost parameter. it might have been used before, or probably passed
just to match the other navigation callbacks where the embedders needs a RVH.
let's just switch this to a RFH now so no one adds more work for us later by
using the RVH?

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

Done.

 }
 
 void WebContentsImpl::OnDidLoadResourceFromMemoryCache(
     const GURL& url,
     const std::string& security_info,
     const std::string& http_method,
     const std::string& mime_type,
     ResourceType::Type resource_type) {
   base::StatsCounter cache("WebKit.CacheHit");
   cache.Increment();
@@ skipping 1621 matching lines @@
 }
 
 void WebContentsImpl::OnFrameRemoved(
     RenderViewHostImpl* render_view_host,
     int64 frame_id) {
    FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                      FrameDetached(render_view_host, frame_id));
 }
 
 }  // namespace content