Revert r143458 (which re-applies r143341 and r142979).

content/browser/renderer_host/sync_resource_handler.cc

Index: content/browser/renderer_host/sync_resource_handler.cc
===================================================================
--- content/browser/renderer_host/sync_resource_handler.cc	(revision 143642)
+++ content/browser/renderer_host/sync_resource_handler.cc	(working copy)
@@ -18,14 +18,15 @@
 
 SyncResourceHandler::SyncResourceHandler(
     ResourceMessageFilter* filter,
-    const GURL& url,
+    net::URLRequest* request,
     IPC::Message* result_message,
     ResourceDispatcherHostImpl* resource_dispatcher_host)
     : read_buffer_(new net::IOBuffer(kReadBufSize)),
       filter_(filter),
+      request_(request),
       result_message_(result_message),
       rdh_(resource_dispatcher_host) {
-  result_.final_url = url;
+  result_.final_url = request_->url();
 }
 
 SyncResourceHandler::~SyncResourceHandler() {
@@ -46,12 +47,10 @@
     const GURL& new_url,
     ResourceResponse* response,
     bool* defer) {
-  net::URLRequest* request = rdh_->GetURLRequest(
-      GlobalRequestID(filter_->child_id(), request_id));
   if (rdh_->delegate())
-    rdh_->delegate()->OnRequestRedirected(request, response);
+    rdh_->delegate()->OnRequestRedirected(request_, response);
 
-  DevToolsNetLogObserver::PopulateResponseInfo(request, response);
+  DevToolsNetLogObserver::PopulateResponseInfo(request_, response);
   // TODO(darin): It would be much better if this could live in WebCore, but
   // doing so requires API changes at all levels.  Similar code exists in
   // WebCore/platform/network/cf/ResourceHandleCFNet.cpp :-(
@@ -67,12 +66,10 @@
     int request_id,
     ResourceResponse* response,
     bool* defer) {
-  net::URLRequest* request = rdh_->GetURLRequest(
-      GlobalRequestID(filter_->child_id(), request_id));
   if (rdh_->delegate())
-    rdh_->delegate()->OnResponseStarted(request, response, filter_);
+    rdh_->delegate()->OnResponseStarted(request_, response, filter_);
 
-  DevToolsNetLogObserver::PopulateResponseInfo(request, response);
+  DevToolsNetLogObserver::PopulateResponseInfo(request_, response);
 
   // We don't care about copying the status here.
   result_.headers = response->headers;
@@ -116,10 +113,8 @@
     const std::string& security_info) {
   result_.status = status;
 
-  net::URLRequest* request = rdh_->GetURLRequest(
-      GlobalRequestID(filter_->child_id(), request_id));
   result_.encoded_data_length =
-      DevToolsNetLogObserver::GetAndResetEncodedDataLength(request);
+      DevToolsNetLogObserver::GetAndResetEncodedDataLength(request_);
 
   ResourceHostMsg_SyncLoad::WriteReplyParams(result_message_, result_);
   filter_->Send(result_message_);