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

content/browser/renderer_host/buffered_resource_handler.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/buffered_resource_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 365 matching lines @@
     bool* defer) {
   // Inform the original ResourceHandler that this will be handled entirely by
   // the new ResourceHandler.
   // TODO(darin): We should probably check the return values of these.
   bool defer_ignored = false;
   next_handler_->OnResponseStarted(request_id, response_, &defer_ignored);
   DCHECK(!defer_ignored);
   net::URLRequestStatus status(net::URLRequestStatus::HANDLED_EXTERNALLY, 0);
   next_handler_->OnResponseCompleted(request_id, status, std::string());
 
-  // Remove the non-owning pointer to the CrossSiteResourceHandler, if any,
-  // from the extra request info because the CrossSiteResourceHandler (part of
-  // the original ResourceHandler chain) will be deleted by the next statement.
-  ResourceRequestInfoImpl* info =
-      ResourceRequestInfoImpl::ForRequest(request_);
-  info->set_cross_site_handler(NULL);
-
   // This is handled entirely within the new ResourceHandler, so just reset the
   // original ResourceHandler.
   next_handler_ = handler.Pass();
   next_handler_->SetController(controller());
 
   next_handler_needs_response_started_ = true;
   next_handler_needs_will_read_ = true;
 
   return ForwardPendingEventsToNextHandler(request_id, defer);
 }
@@ skipping 44 matching lines @@
 
   bool defer = false;
   if (!CompleteResponseStarted(request_id, &defer)) {
     controller()->Cancel();
   } else if (!defer && needs_resume) {
     controller()->Resume();
   }
 }
 
 }  // namespace content