Revert 97048 - Trying to see if this is related with a

sync_integration_test crash on MacOS.

Update routing id of pending resource requests for reparented iframes.

BUG=55200
TEST=MagicIframeBrowserTest.TransferIframeCloseWindow

Review URL: http://codereview.chromium.org/7647003

TBR=dimich@chromium.org
Review URL: http://codereview.chromium.org/7627003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97072 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 3 insertions, 19 deletions

diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index a978166..dcc86f4 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -389,10 +389,6 @@ class ResourceLoaderBridge {
   // response parameter.
   virtual void SyncLoad(SyncLoadResponse* response) = 0;
 
-  // When loader is transferred from one page to another, the IPC routing id
-  // can change (they are associated with pages).
-  virtual void UpdateRoutingId(int new_routing_id) = 0;
-
  protected:
   // construction must go through Create()
   ResourceLoaderBridge();
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 97ada31..102761c 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -263,7 +263,6 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context>,
   void Start(
       const WebURLRequest& request,
       ResourceLoaderBridge::SyncLoadResponse* sync_load_response);
-  void UpdateRoutingId(int new_routing_id);
 
   // ResourceLoaderBridge::Peer methods:
   virtual void OnUploadProgress(uint64 position, uint64 size);
@@ -325,11 +324,6 @@ void WebURLLoaderImpl::Context::SetDefersLoading(bool value) {
     bridge_->SetDefersLoading(value);
 }
 
-void WebURLLoaderImpl::Context::UpdateRoutingId(int new_routing_id) {
-  if (bridge_.get())
-    bridge_->UpdateRoutingId(new_routing_id);
-}
-
 void WebURLLoaderImpl::Context::Start(
     const WebURLRequest& request,
     ResourceLoaderBridge::SyncLoadResponse* sync_load_response) {
@@ -735,8 +729,4 @@ void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
-void WebURLLoaderImpl::UpdateRoutingId(int new_routing_id) {
-  context_->UpdateRoutingId(new_routing_id);
-}
-
 }  // namespace webkit_glue
diff --git a/webkit/glue/weburlloader_impl.h b/webkit/glue/weburlloader_impl.h
index ace1cdb..4403c17 100644
--- a/webkit/glue/weburlloader_impl.h
+++ b/webkit/glue/weburlloader_impl.h
@@ -1,6 +1,6 @@
-// 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.
+// 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 WEBKIT_GLUE_WEBURLLOADER_IMPL_H_
 #define WEBKIT_GLUE_WEBURLLOADER_IMPL_H_
@@ -27,8 +27,6 @@ class WebURLLoaderImpl : public WebKit::WebURLLoader {
   virtual void cancel();
   virtual void setDefersLoading(bool value);
 
-  void UpdateRoutingId(int new_routing_id);
-
  private:
   class Context;
   scoped_refptr<Context> context_;