Move TransferNavigationResourceThrottle into CrossSiteResourceHandler.

content/browser/loader/resource_loader.cc

Index: content/browser/loader/resource_loader.cc
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index c99fe5b0d7cd36eb1f45ac2464bdc287ffef3b73..8a23c88ef0cefabf87943ae6b95665a329fa3d84 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -9,6 +9,7 @@
 #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"
@@ -165,10 +166,12 @@ void ResourceLoader::MarkAsTransferring(const GURL& 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() {