Remove unnecessary call to set_first_party_for_cookies.

Appears to no longer be needed after the changes to navigation transfers,
now that the transfer happens at commit and the resource handler is
preserved.

BUG=262860
TEST=ResourceDispatcherHostBrowserTest.CookiePolicy still passes.
R=jochen@chromium.org

Review URL: https://codereview.chromium.org/117623003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241606 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 7 insertions, 16 deletions

diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc
index 3a56820..8fb1c41 100644
--- a/content/browser/loader/cross_site_resource_handler.cc
+++ b/content/browser/loader/cross_site_resource_handler.cc
@@ -289,8 +289,7 @@ void CrossSiteResourceHandler::StartCrossSiteTransition(
     referrer = Referrer(GURL(request()->referrer()), info->GetReferrerPolicy());
     frame_id = info->GetFrameID();
 
-    ResourceDispatcherHostImpl::Get()->MarkAsTransferredNavigation(
-        global_id, transfer_url_chain.front());
+    ResourceDispatcherHostImpl::Get()->MarkAsTransferredNavigation(global_id);
   }
   BrowserThread::PostTask(
       BrowserThread::UI,
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 8b998bd..d6c70bf 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1351,8 +1351,8 @@ void ResourceDispatcherHostImpl::BeginSaveFile(
 }
 
 void ResourceDispatcherHostImpl::MarkAsTransferredNavigation(
-    const GlobalRequestID& id, const GURL& target_url) {
-  GetLoader(id)->MarkAsTransferring(target_url);
+    const GlobalRequestID& id) {
+  GetLoader(id)->MarkAsTransferring();
 }
 
 void ResourceDispatcherHostImpl::ResumeDeferredNavigation(
diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
index b6922e5..c3c95fe 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.h
+++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -131,8 +131,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
 
   // Marks the request as "parked". This happens if a request is
   // redirected cross-site and needs to be resumed by a new render view.
-  void MarkAsTransferredNavigation(const GlobalRequestID& id,
-                                   const GURL& target_url);
+  void MarkAsTransferredNavigation(const GlobalRequestID& id);
 
   // Resumes the request without transferring it to a new render view.
   void ResumeDeferredNavigation(const GlobalRequestID& id);
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc
index 52d3432..9d58b8f 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -2059,8 +2059,7 @@ TEST_F(ResourceDispatcherHostTest, CancelRequestsForContextTransferred) {
 
 
   GlobalRequestID global_request_id(filter_->child_id(), request_id);
-  host_.MarkAsTransferredNavigation(global_request_id,
-                                    GURL("http://example.com/blah"));
+  host_.MarkAsTransferredNavigation(global_request_id);
 
   // And now simulate a cancellation coming from the renderer.
   ResourceHostMsg_CancelRequest msg(request_id);
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 2f2182c..886dba4 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -161,16 +161,10 @@ void ResourceLoader::ReportUploadProgress() {
   }
 }
 
-void ResourceLoader::MarkAsTransferring(const GURL& target_url) {
+void ResourceLoader::MarkAsTransferring() {
   CHECK(ResourceType::IsFrame(GetRequestInfo()->GetResourceType()))
       << "Can only transfer for 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.
-  // TODO(creis): Remove this in https://codereview.chromium.org/117623003/.
-  if (GetRequestInfo()->GetResourceType() == ResourceType::MAIN_FRAME)
-    request()->set_first_party_for_cookies(target_url);
 }
 
 void ResourceLoader::CompleteTransfer() {
diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h
index d0b3ae8..55117df 100644
--- a/content/browser/loader/resource_loader.h
+++ b/content/browser/loader/resource_loader.h
@@ -39,7 +39,7 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
   void ReportUploadProgress();
 
   bool is_transferring() const { return is_transferring_; }
-  void MarkAsTransferring(const GURL& target_url);
+  void MarkAsTransferring();
   void CompleteTransfer();
 
   net::URLRequest* request() { return request_.get(); }