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/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "content/browser/child_process_security_policy_impl.h"
+#include "content/browser/loader/cross_site_resource_handler.h"
 #include "content/browser/loader/resource_loader_delegate.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/browser/ssl/ssl_manager.h"
 #include "content/common/ssl_status_serialization.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
@@ skipping 136 matching lines @@
   CHECK_EQ(GetRequestInfo()->GetResourceType(), ResourceType::MAIN_FRAME)
       << "Cannot transfer non-main frame navigations";
   is_transferring_ = true;
 
   // When transferring a request to another process, the renderer doesn't get
   // a chance to update the cookie policy URL. Do it here instead.
   request()->set_first_party_for_cookies(target_url);
 }
 
 void ResourceLoader::CompleteTransfer() {
-  DCHECK_EQ(DEFERRED_REDIRECT, deferred_stage_);
+  DCHECK_EQ(DEFERRED_READ, deferred_stage_);
 
   is_transferring_ = false;
-  Resume();
+  ResourceRequestInfoImpl* info = GetRequestInfo();
+  if (info->cross_site_handler())
+    info->cross_site_handler()->ResumeResponse();

[darin (slow to review), 2013/10/01 03:54:15]

what happens if the cross_site_handler() is null here? does the ResourceLoader
get cleaned up properly somehow?

[Charlie Reis, 2013/10/01 17:15:11]

Good question.  This should never happen, since CompleteTransfer is only called
from RDH::BeginRequest after we've found the deferred_loader and run
UpdateRequestForTransfer.  I've added a DCHECK to UpdateRequestForTransfer to
make sure the cross_site_handler exists, and I've removed the null check from
here so that we get a crash report if it ever happens.

 }
 
 ResourceRequestInfoImpl* ResourceLoader::GetRequestInfo() {
   return ResourceRequestInfoImpl::ForRequest(request_.get());
 }
 
 void ResourceLoader::ClearLoginDelegate() {
   login_delegate_ = NULL;
 }
 
@@ skipping 466 matching lines @@
     // we resume.
     deferred_stage_ = DEFERRED_FINISH;
   }
 }
 
 void ResourceLoader::CallDidFinishLoading() {
   delegate_->DidFinishLoading(this);
 }
 
 }  // namespace content