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

chrome/browser/renderer_host/buffered_resource_handler.cc

 // Copyright (c) 2010 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 "chrome/browser/renderer_host/buffered_resource_handler.h"
 
 #include <vector>
 
 #include "base/histogram.h"
 #include "base/logging.h"
@@ skipping 286 matching lines @@
 bool BufferedResourceHandler::CompleteResponseStarted(int request_id,
                                                       bool in_complete) {
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request_);
   std::string mime_type;
   request_->GetMimeType(&mime_type);
 
   // 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.
 
     if (response_->response_head.headers &&  // Can be NULL if FTP.
         response_->response_head.headers->response_code() / 100 != 2) {
       // The response code indicates that this is an error page, but we are
       // expecting an X.509 user certificate. We follow Firefox here and show
       // our own error page instead of handling the error page as a
       // certificate.
       // TODO(abarth): We should abstract the response_code test, but this kind
@@ skipping 132 matching lines @@
     CHECK((buf_len >= bytes_read_) && (bytes_read_ >= 0));
     memcpy(buf->data(), read_buffer_->data(), bytes_read_);
   }
 
   // Inform the original ResourceHandler that this will be handled entirely by
   // the new ResourceHandler.
   real_handler_->OnResponseStarted(info->request_id(), response_);
   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;
 }
 
 void BufferedResourceHandler::LoadPlugins() {
   std::vector<WebPluginInfo> plugins;
   NPAPI::PluginList::Singleton()->GetPlugins(false, &plugins);
 
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(this, &BufferedResourceHandler::OnPluginsLoaded));
 }
 
 void BufferedResourceHandler::OnPluginsLoaded() {
   wait_for_plugins_ = false;
   if (!request_)
     return;
 
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request_);
   host_->PauseRequest(info->child_id(), info->request_id(), false);
   if (!CompleteResponseStarted(info->request_id(), false))
     host_->CancelRequest(info->child_id(), info->request_id(), false);
 }