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 224 matching lines @@
     return source_browser->profile();
 
   if (params->profile)
     return params->profile;
 
   // We couldn't find one in any of the source metadata, so we'll fall back to
   // the profile associated with the target browser.
   return params->browser->profile();
 }
 
+void LoadURLInContents(TabContents* target_contents,
+                       const GURL& url,
+                       browser::NavigateParams* params,
+                       const std::string& extra_headers) {
+  if (params->transferred_global_request_id != GlobalRequestID()) {
+    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) {
+    target_contents->controller().LoadURLFromRenderer(
+        url, params->referrer, params->transition,  extra_headers);
+  } else {
+    target_contents->controller().LoadURL(
+        url, params->referrer, params->transition, extra_headers);
+  }
+
+}
 
 // This class makes sure the Browser object held in |params| is made visible
 // by the time it goes out of scope, provided |params| wants it to be shown.
 class ScopedBrowserDisplayer {
  public:
   explicit ScopedBrowserDisplayer(browser::NavigateParams* params)
       : params_(params) {
   }
   ~ScopedBrowserDisplayer() {
     if (params_->window_action == browser::NavigateParams::SHOW_WINDOW_INACTIVE)
@@ skipping 237 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) {
-        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);
-      }
+
+      LoadURLInContents(params->target_contents->tab_contents(),
+                        url, params, 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
     // add it to the appropriate tabstrip.
   }
 
   // If the user navigated from the omnibox, and the selected tab is going to
   // lose focus, then make sure the focus for the source tab goes away from the
   // omnibox.
@@ skipping 27 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) {
-        target->controller().LoadURLFromRenderer(
-            params->url, params->referrer, params->transition, extra_headers);
-      } else {
-        target->controller().LoadURL(
-            params->url, params->referrer, params->transition, extra_headers);
-      }
+      LoadURLInContents(target, params->url, params, extra_headers);
     }
 
     // If the singleton tab isn't already selected, select it.
     if (params->source_contents != params->target_contents)
       params->browser->ActivateTabAt(singleton_index, user_initiated);
   }
 
   if (params->disposition != CURRENT_TAB) {
     content::NotificationService::current()->Notify(
         content::NOTIFICATION_TAB_ADDED,
@@ skipping 53 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