Move TransferNavigationResourceThrottle into CrossSiteResourceHandler.

content/browser/loader/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/loader/resource_loader.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "content/browser/child_process_security_policy_impl.h"
@@ skipping 154 matching lines @@
   // 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_EQ(DEFERRED_READ, deferred_stage_);
   DCHECK(!handler_.get());
 
   handler_ = new_handler.Pass();
   handler_->SetController(this);
-  is_transferring_ = false;
 
   Resume();
 }
 
 ResourceRequestInfoImpl* ResourceLoader::GetRequestInfo() {
   return ResourceRequestInfoImpl::ForRequest(request_.get());
 }
 
 void ResourceLoader::ClearLoginDelegate() {
   login_delegate_ = NULL;
@@ skipping 228 matching lines @@
 
 void ResourceLoader::ContinueSSLRequest(const GlobalRequestID& id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   DVLOG(1) << "ContinueSSLRequest() url: " << request_->url().spec();
 
   request_->ContinueDespiteLastError();
 }
 
 void ResourceLoader::Resume() {
-  DCHECK(!is_transferring_);
+  bool was_transfer = is_transferring_;
+  is_transferring_ = false;
 
   DeferredStage stage = deferred_stage_;
   deferred_stage_ = DEFERRED_NONE;
   switch (stage) {
     case DEFERRED_NONE:
       NOTREACHED();
       break;
     case DEFERRED_START:
       StartRequestInternal();
       break;
     case DEFERRED_REDIRECT:
       request_->FollowDeferredRedirect();
       break;
     case DEFERRED_READ:
-      base::MessageLoop::current()->PostTask(
-          FROM_HERE,
-          base::Bind(&ResourceLoader::ResumeReading,
-                     weak_ptr_factory_.GetWeakPtr()));
+      if (was_transfer) {
+        // We need to go through the OnResponseStarted steps again in the new
+        // resource handler.
+        OnResponseStarted(request_.get());
+      } else {
+        base::MessageLoop::current()->PostTask(
+            FROM_HERE,
+            base::Bind(&ResourceLoader::ResumeReading,
+                       weak_ptr_factory_.GetWeakPtr()));
+      }
       break;
     case DEFERRED_FINISH:
       // Delay self-destruction since we don't know how we were reached.
       base::MessageLoop::current()->PostTask(
           FROM_HERE,
           base::Bind(&ResourceLoader::CallDidFinishLoading,
                      weak_ptr_factory_.GetWeakPtr()));
       break;
   }
 }
@@ skipping 195 matching lines @@
     // we resume.
     deferred_stage_ = DEFERRED_FINISH;
   }
 }
 
 void ResourceLoader::CallDidFinishLoading() {
   delegate_->DidFinishLoading(this);
 }
 
 }  // namespace content