Convert 'CookieOptions::first_party_url' to a 'url::Origin'.

net/cookies/canonical_cookie.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.
 
 // Portions of this code based on Mozilla:
 //   (netwerk/cookie/src/nsCookieService.cpp)
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ skipping 373 matching lines @@
   if (IsSecure() && !url.SchemeIsCryptographic())
     return false;
   // Don't include cookies for requests that don't apply to the cookie domain.
   if (!IsDomainMatch(url.host()))
     return false;
   // Don't include cookies for requests with a url path that does not path
   // match the cookie-path.
   if (!IsOnPath(url.path()))
     return false;
 
-  // Include first-party-only cookies iff |options| tells us to include all of
-  // them, or if a first-party URL is set and its origin matches the origin of
-  // |url|.
+  // Include first-party-only cookies if:
+  //
+  // * |options| tells us to include all of them
+  // * a first-party origin is set, and they matches the origin of |url|
   if (IsFirstPartyOnly() && !options.include_first_party_only() &&

[mmenke, 2015/10/16 17:29:26]

Wait....We're more restrictive when options.include_first_party_only is not set
than when it is set?

[Mike West, 2015/10/16 18:57:08]

No? If `include_first_party_only` is set, we skip out of this `if`, which means
we don't return `false`, which means the cookie is included. Too many negations,
I know... :)

[mmenke, 2015/10/16 19:02:09]

Right...So "include_first_party_only()" is set, we return more in another
case...  So we're less restrictive when it's true, which seems counter
intuitive.

-      options.first_party_url().GetOrigin() != url.GetOrigin()) {
+      !options.first_party().IsSameOriginWith(url::Origin(url.GetOrigin()))) {

[mmenke, 2015/10/16 17:29:26]

I don't think GetOrigin() is needed here?  It's not used in
options.set_first_party.

[Mike West, 2015/10/16 18:57:08]

Yeah. I should have dropped it.

     return false;
   }
 
   return true;
 }
 
 std::string CanonicalCookie::DebugString() const {
   return base::StringPrintf(
       "name: %s value: %s domain: %s path: %s creation: %"
       PRId64,
@@ skipping 31 matching lines @@
   if (IsSecure() != other.IsSecure())
     return IsSecure();
 
   if (IsHttpOnly() != other.IsHttpOnly())
     return IsHttpOnly();
 
   return Priority() < other.Priority();
 }
 
 }  // namespace net