Fix a bug where redirect chain gets lost on process swap.

content/renderer/render_view_impl.cc

 // Copyright (c) 2011 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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 2034 matching lines @@
   // tab, and we want to still allow that.
   //
   // Note: we do this only for GET requests because our mechanism for switching
   // processes only issues GET requests. In particular, POST requests don't
   // work, because this mechanism does not preserve form POST data. If it
   // becomes necessary to support process switching for POST requests, we will
   // need to send the request's httpBody data up to the browser process, and
   // issue a special POST navigation in WebKit (via
   // FrameLoader::loadFrameRequest). See ResourceDispatcher and WebURLLoaderImpl
   // for examples of how to send the httpBody data.
-  // Note2: We normally don't do this for browser-initiated navigations, since
-  // it's pointless to tell the browser about navigations it gave us. But
-  // we do potentially ask the browser to handle a redirect that was originally
-  // initiated by the browser. See http://crbug.com/70943
-  //
-  // TODO(creis): Move this redirect check to the browser process to avoid
-  // ping-ponging.  See http://crbug.com/72380.
-  if (!frame->parent() && (is_content_initiated || is_redirect) &&
+  if (!frame->parent() && is_content_initiated &&
       default_policy == WebKit::WebNavigationPolicyCurrentTab &&
       request.httpMethod() == "GET" && !url.SchemeIs(chrome::kAboutScheme)) {
     bool send_referrer = false;
     bool should_fork =
         (enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI) ||
         frame->isViewSourceModeEnabled() ||
         url.SchemeIs(chrome::kViewSourceScheme);
 
     if (!should_fork) {
       // Give the embedder a chance.
@@ skipping 252 matching lines @@
     document_state->set_request_time(params.request_time);
 
   // A navigation resulting from loading a javascript URL should not be treated
   // as a browser initiated event.  Instead, we want it to look as if the page
   // initiated any load resulting from JS execution.
   if (!params.url.SchemeIs(chrome::kJavaScriptScheme)) {
     NavigationState* navigation_state = NavigationState::CreateBrowserInitiated(
         params.page_id,
         params.pending_history_list_offset,
         params.transition);
+    navigation_state->set_transferred_request_child_id(
+        params.transferred_request_child_id);
+    navigation_state->set_transferred_request_request_id(
+        params.transferred_request_request_id);
     if (params.navigation_type == ViewMsg_Navigate_Type::RESTORE) {
       // We're doing a load of a page that was restored from the last session.
       // By default this prefers the cache over loading (LOAD_PREFERRING_CACHE)
       // which can result in stale data for pages that are set to expire. We
       // explicitly override that by setting the policy here so that as
       // necessary we load from the network.
       document_state->set_cache_policy_override(
           WebURLRequest::UseProtocolCachePolicy);
     }
     document_state->set_navigation_state(navigation_state);
@@ skipping 380 matching lines @@
       request.setCachePolicy(document_state->cache_policy_override());
     transition_type = navigation_state->transition_type();
   }
 
   request.setExtraData(
       new RequestExtraData(frame->referrerPolicy(),
                            (frame == top_frame),
                            frame->identifier(),
                            frame->parent() == top_frame,
                            frame->parent() ? frame->parent()->identifier() : -1,
-                           transition_type));
+                           transition_type,
+                           navigation_state->transferred_request_child_id(),
+                           navigation_state->transferred_request_request_id()));
 
   DocumentState* top_document_state =
       DocumentState::FromDataSource(top_data_source);
   // TODO(gavinp): separate out prefetching and prerender field trials
   // if the rel=prerender rel type is sticking around.
   if (top_document_state &&
       (request.targetType() == WebURLRequest::TargetIsPrefetch ||
        request.targetType() == WebURLRequest::TargetIsPrerender))
     top_document_state->set_was_prefetcher(true);
 
@@ skipping 2015 matching lines @@
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit(
     const IPC::ChannelHandle& channel_handle) {
   DCHECK(!java_bridge_dispatcher_.get());
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
 #endif
 }