Fix transferring processes during a redirect.

content/browser/renderer_host/resource_loader.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/resource_loader.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/renderer_host/doomed_resource_handler.h"
@@ skipping 129 matching lines @@
   // When an URLRequest is transferred to a new RenderViewHost, its
   // ResourceHandler should not receive any notifications because it may depend
   // on the state of the old RVH. We set a ResourceHandler that only allows
   // canceling requests, because on shutdown of the RDH all pending requests
   // are canceled. The RVH of requests that are being transferred may be gone
   // by that time. In CompleteTransfer, the ResoureHandlers are substituted
   // again.
   handler_.reset(new DoomedResourceHandler(handler_.Pass()));
 }
 
+void ResourceLoader::WillCompleteTransfer() {
+  handler_.reset();
+}
+
 void ResourceLoader::CompleteTransfer(scoped_ptr<ResourceHandler> new_handler) {
   DCHECK_EQ(DEFERRED_REDIRECT, deferred_stage_);
+  DCHECK(!handler_.get());
 
   handler_ = new_handler.Pass();
   handler_->SetController(this);
   is_transferring_ = false;
 
   Resume();
 }
 
 ResourceRequestInfoImpl* ResourceLoader::GetRequestInfo() {
   return ResourceRequestInfoImpl::ForRequest(request_.get());
@@ skipping 390 matching lines @@
     // we resume.
     deferred_stage_ = DEFERRED_FINISH;
   }
 }
 
 void ResourceLoader::CallDidFinishLoading() {
   delegate_->DidFinishLoading(this);
 }
 
 }  // namespace content