Reland 97048 - Update routing id of pending resource requests for reparented iframes.

content/common/resource_dispatcher.cc

Index: content/common/resource_dispatcher.cc
===================================================================
--- content/common/resource_dispatcher.cc	(revision 97077)
+++ content/common/resource_dispatcher.cc	(working copy)
@@ -53,6 +53,7 @@
   virtual void Cancel();
   virtual void SetDefersLoading(bool value);
   virtual void SyncLoad(SyncLoadResponse* response);
+  virtual void UpdateRoutingId(int new_routing_id);
 
  private:
   ResourceLoaderBridge::Peer* peer_;
@@ -224,6 +225,18 @@
   response->download_file_path = result.download_file_path;
 }
 
+void IPCResourceLoaderBridge::UpdateRoutingId(int new_routing_id) {
+  if (request_id_ < 0) {
+    NOTREACHED() << "Trying to update an unstarted request";
+    return;
+  }
+
+  routing_id_ = new_routing_id;
+  dispatcher_->message_sender()->Send(
+      new ResourceHostMsg_TransferRequestToNewPage(new_routing_id,
+                                                   request_id_));
+}
+
 }  // namespace webkit_glue
 
 // ResourceDispatcher ---------------------------------------------------------