Navigation transitions: Plumb data from the outgoing renderer to the incoming renderer

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index eb459ede4b43bf2b77a7e3ef1ca8367f4166d185..44226a3c3a695583b47736d82e729ba01ab3c38c 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -635,15 +635,14 @@ void RenderFrameHostImpl::OnCrossSiteResponse(
 
 void RenderFrameHostImpl::OnDeferredAfterResponseStarted(
     const GlobalRequestID& global_request_id,
-    const scoped_refptr<net::HttpResponseHeaders>& headers,
-    const GURL& url) {
+    const TransitionLayerData& transition_data) {
   frame_tree_node_->render_manager()->OnDeferredAfterResponseStarted(
       global_request_id, this);
 
   if (GetParent() || !delegate_->WillHandleDeferAfterResponseStarted())
     frame_tree_node_->render_manager()->ResumeResponseDeferredAtStart();
   else
-    delegate_->DidDeferAfterResponseStarted(headers, url);
+    delegate_->DidDeferAfterResponseStarted(transition_data);
 }
 
 void RenderFrameHostImpl::SwapOut(RenderFrameProxyHost* proxy) {
@@ -1184,17 +1183,15 @@ RenderFrameHostImpl::GetParentNativeViewAccessible() const {
 }
 #endif  // defined(OS_WIN)
 
-void RenderFrameHostImpl::SetHasPendingTransitionRequest(
-    bool has_pending_request) {
+void RenderFrameHostImpl::ClearPendingTransitionRequestData() {
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(
-          &TransitionRequestManager::SetHasPendingTransitionRequest,
+          &TransitionRequestManager::ClearPendingTransitionRequestData,
           base::Unretained(TransitionRequestManager::GetInstance()),
           GetProcess()->GetID(),
-          routing_id_,
-          has_pending_request));
+          routing_id_));
 }
 
 }  // namespace content