Move DidReceiveServerRedirectForProvisionalLoad from RenderView to RenderFrame

content/renderer/render_frame_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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 889 matching lines @@
       DidStartProvisionalLoad(frame));
 
   Send(new FrameHostMsg_DidStartProvisionalLoadForFrame(
        routing_id_, frame->identifier(),
        frame->parent() ? frame->parent()->identifier() : -1,
        is_top_most, ds->request().url()));
 }
 
 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad(
     blink::WebFrame* frame) {
-  // TODO(nasko): Move implementation here. Needed state:
-  // * page_id_
-  render_view_->didReceiveServerRedirectForProvisionalLoad(frame);
+  if (frame->parent())
+    return;
+  // Received a redirect on the main frame.
+  WebDataSource* data_source = frame->provisionalDataSource();
+  if (!data_source) {
+    // Should only be invoked when we have a data source.
+    NOTREACHED();
+    return;
+  }
+  std::vector<GURL> redirects;
+  RenderViewImpl::GetRedirectChain(data_source, &redirects);
+  if (redirects.size() >= 2) {
+    Send(new FrameHostMsg_DidRedirectProvisionalLoad(routing_id_,

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

nit: i realize you just moved it, but can you fix the argument wrapping? this is
against the style guide since the arguments should start in the same column on
each line

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

Done.

+        render_view_->page_id_, redirects[redirects.size() - 2],
+        redirects.back()));
+  }
 }
 
 void RenderFrameImpl::didFailProvisionalLoad(
     blink::WebFrame* frame,
     const blink::WebURLError& error) {
   WebDataSource* ds = frame->provisionalDataSource();
   DCHECK(ds);
 
   const WebURLRequest& failed_request = ds->request();
 
@@ skipping 598 matching lines @@
 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) {
   observer->RenderFrameGone();
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace content