Merge 49411 - UseAlternateResourceHandler should set the non-owning pointer...

chrome/browser/renderer_host/buffered_resource_handler.cc

Index: chrome/browser/renderer_host/buffered_resource_handler.cc
===================================================================
--- chrome/browser/renderer_host/buffered_resource_handler.cc	(revision 49561)
+++ chrome/browser/renderer_host/buffered_resource_handler.cc	(working copy)
@@ -304,7 +304,6 @@
   // Check if this is an X.509 certificate, if yes, let it be handled
   // by X509UserCertResourceHandler.
   if (mime_type == "application/x-x509-user-cert") {
-
     // This is entirely similar to how DownloadThrottlingResourceHandler
     // works except we are doing it for an X.509 client certificates.
 
@@ -457,6 +456,11 @@
   URLRequestStatus status(URLRequestStatus::HANDLED_EXTERNALLY, 0);
   real_handler_->OnResponseCompleted(info->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.
+  info->set_cross_site_handler(NULL);
+
   // This is handled entirely within the new ResourceHandler, so just reset the
   // original ResourceHandler.
   real_handler_ = handler;