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

chrome/browser/ui/browser_navigator.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 "chrome/browser/ui/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
@@ skipping 481 matching lines @@
     }
 
     InitializeExtraHeaders(params, params->target_contents->profile(),
                            &extra_headers);
 
     // Try to handle non-navigational URLs that popup dialogs and such, these
     // should not actually navigate.
     if (!HandleNonNavigationAboutURL(url)) {
       // Perform the actual navigation, tracking whether it came from the
       // renderer.
-      if (params->is_renderer_initiated) {
+
+      if (params->transferred_global_request_id != GlobalRequestID()) {
+        params->target_contents->controller().TransferURL(
+            url, params->referrer, params->transition, extra_headers,
+            params->transferred_global_request_id,
+            params->is_renderer_initiated);
+      } else if (params->is_renderer_initiated) {
         params->target_contents->controller().LoadURLFromRenderer(
             url, params->referrer, params->transition, extra_headers);
       } else {
         params->target_contents->controller().LoadURL(
             url, params->referrer, params->transition, extra_headers);
       }
     }
   } else {
     // |target_contents| was specified non-NULL, and so we assume it has already
     // been navigated appropriately. We need to do nothing more other than
@@ skipping 33 matching lines @@
   }
 
   if (singleton_index >= 0) {
     TabContents* target = params->browser->GetTabContentsAt(singleton_index);
 
     if (target->is_crashed()) {
       target->controller().Reload(true);
     } else if (params->path_behavior == NavigateParams::IGNORE_AND_NAVIGATE &&
         target->GetURL() != params->url) {
       InitializeExtraHeaders(params, NULL, &extra_headers);
-      if (params->is_renderer_initiated) {
+      if (params->transferred_global_request_id != GlobalRequestID()) {

[Charlie Reis, 2011/12/02 22:38:11]

Perhaps we should abstract out this three-clause if (here and above) into a
helper function that takes in the controller and params?

[Matt Perry, 2011/12/03 00:14:24]

Done.

+        target->controller().TransferURL(
+            params->url, params->referrer, params->transition, extra_headers,
+            params->transferred_global_request_id,
+            params->is_renderer_initiated);
+      } else if (params->is_renderer_initiated) {
         target->controller().LoadURLFromRenderer(
             params->url, params->referrer, params->transition, extra_headers);
       } else {
         target->controller().LoadURL(
             params->url, params->referrer, params->transition, extra_headers);
       }
     }
 
     // If the singleton tab isn't already selected, select it.
     if (params->source_contents != params->target_contents)
@@ skipping 59 matching lines @@
   // chrome://settings.
 
   return !(url.scheme() == chrome::kChromeUIScheme &&
       (url.host() == chrome::kChromeUISettingsHost ||
        url.host() == chrome::kChromeUIExtensionsHost ||
        url.host() == chrome::kChromeUIBookmarksHost ||
        url.host() == chrome::kChromeUISyncPromoHost));
 }
 
 }  // namespace browser