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

content/browser/tab_contents/navigation_entry.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "content/browser/renderer_host/global_request_id.h"
 #include "content/common/content_export.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/page_type.h"
 #include "content/public/common/security_style.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cert_status_flags.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class SiteInstance;
 
@@ skipping 382 matching lines @@
 
   // The RestoreType for this entry. This is set if the entry was retored. This
   // is set to RESTORE_NONE once the entry is loaded.
   void set_restore_type(RestoreType type) {
     restore_type_ = type;
   }
   RestoreType restore_type() const {
     return restore_type_;
   }
 
+  void set_transferred_global_request_id(
+      const GlobalRequestID& transferred_global_request_id) {
+    transferred_global_request_id_ = transferred_global_request_id;
+  }
+
+  GlobalRequestID transferred_global_request_id() const {
+    return transferred_global_request_id_;
+  }
+
  private:
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
   // Session/Tab restore save portions of this class so that it can be recreated
   // later. If you add a new field that needs to be persisted you'll have to
   // update SessionService/TabRestoreService appropriately.
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   // See the accessors above for descriptions.
   int unique_id_;
   scoped_refptr<SiteInstance> site_instance_;
@@ skipping 19 matching lines @@
   // navigation.  This dictates whether the URL should be displayed before the
   // navigation commits.  It is cleared on commit and not persisted.
   bool is_renderer_initiated_;
 
   // This is a cached version of the result of GetTitleForDisplay. It prevents
   // us from having to do URL formatting on the URL every time the title is
   // displayed. When the URL, virtual URL, or title is set, this should be
   // cleared to force a refresh.
   mutable string16 cached_display_title_;
 
+  // In case a navigation is transferred to a new RVH but the request has
+  // been generated in the renderer already, |transferred_global_request_id_|
+  // identifies the old request so that it can be recycled. The old request
+  // is stored until the ResourceDispatcher receives the a navigation from the

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

nit: the a

Also, please clarify that this gets removed once the transfer is complete, so
this value is not persisted.

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

Done.

+  // renderer which carries this |transferred_global_request_id_| annotation.
+  GlobalRequestID transferred_global_request_id_;
+
   // Copy and assignment is explicitly allowed for this class.
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_