Move first-party cookie URL logic to browser process.

content/child/web_url_loader_impl.cc

 // Copyright 2014 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.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "content/child/web_url_loader_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 221 matching lines @@
 
   void Cancel();
   void SetDefersLoading(bool value);
   void DidChangePriority(WebURLRequest::Priority new_priority,
                          int intra_priority_value);
   void Start(const WebURLRequest& request,
              SyncLoadResponse* sync_load_response);
 
   // RequestPeer methods:
   virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
-  virtual bool OnReceivedRedirect(
-      const GURL& new_url,
-      const ResourceResponseInfo& info,
-      bool* has_new_first_party_for_cookies,
-      GURL* new_first_party_for_cookies) OVERRIDE;
+  virtual bool OnReceivedRedirect(const GURL& new_url,
+                                  const GURL& new_first_party_for_cookies,
+                                  const ResourceResponseInfo& info) OVERRIDE;
   virtual void OnReceivedResponse(const ResourceResponseInfo& info) OVERRIDE;
   virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE;
   virtual void OnReceivedData(const char* data,
                               int data_length,
                               int encoded_data_length) OVERRIDE;
   virtual void OnReceivedCachedMetadata(const char* data, int len) OVERRIDE;
   virtual void OnCompletedRequest(
       int error_code,
       bool was_ignored_by_handler,
       bool stale_copy_in_cache,
@@ skipping 210 matching lines @@
   }
 }
 
 void WebURLLoaderImpl::Context::OnUploadProgress(uint64 position, uint64 size) {
   if (client_)
     client_->didSendData(loader_, position, size);
 }
 
 bool WebURLLoaderImpl::Context::OnReceivedRedirect(
     const GURL& new_url,
-    const ResourceResponseInfo& info,
-    bool* has_new_first_party_for_cookies,
-    GURL* new_first_party_for_cookies) {
+    const GURL& new_first_party_for_cookies,
+    const ResourceResponseInfo& info) {
   if (!client_)
     return false;
 
   WebURLResponse response;
   response.initialize();
   PopulateURLResponse(request_.url(), info, &response);
 
   // TODO(darin): We lack sufficient information to construct the actual
   // request that resulted from the redirect.
   WebURLRequest new_request(new_url);
-  new_request.setFirstPartyForCookies(request_.firstPartyForCookies());
+  new_request.setFirstPartyForCookies(new_first_party_for_cookies);
   new_request.setDownloadToFile(request_.downloadToFile());
 
   WebString referrer_string = WebString::fromUTF8("Referer");
   WebString referrer = WebSecurityPolicy::generateReferrerHeader(
       referrer_policy_,
       new_url,
       request_.httpHeaderField(referrer_string));
   if (!referrer.isEmpty())
     new_request.setHTTPReferrer(referrer, referrer_policy_);
 
   std::string method = request_.httpMethod().utf8();
   std::string new_method = net::URLRequest::ComputeMethodForRedirect(
       method, response.httpStatusCode());
   new_request.setHTTPMethod(WebString::fromUTF8(new_method));
   if (new_method == method)
     new_request.setHTTPBody(request_.httpBody());
 
   client_->willSendRequest(loader_, new_request, response);
   request_ = new_request;
-  *has_new_first_party_for_cookies = true;
-  *new_first_party_for_cookies = request_.firstPartyForCookies();
 
   // Only follow the redirect if WebKit left the URL unmodified.
-  if (new_url == GURL(new_request.url()))
+  if (new_url == GURL(new_request.url())) {
+    // First-party cookie logic moved from DocumentLoader in Blink to
+    // CrossSiteResourceHandler in the browser. Assert that Blink didn't try to
+    // change it to something else.
+    DCHECK_EQ(new_first_party_for_cookies.spec(),
+              request_.firstPartyForCookies().string().utf8());
     return true;
+  }
 
   // We assume that WebKit only changes the URL to suppress a redirect, and we
   // assume that it does so by setting it to be invalid.
   DCHECK(!new_request.url().isValid());
   return false;
 }
 
 void WebURLLoaderImpl::Context::OnReceivedResponse(
     const ResourceResponseInfo& info) {
   if (!client_)
@@ skipping 343 matching lines @@
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
 void WebURLLoaderImpl::didChangePriority(WebURLRequest::Priority new_priority,
                                          int intra_priority_value) {
   context_->DidChangePriority(new_priority, intra_priority_value);
 }
 
 }  // namespace content