Teach URLRequest about initiator checks for First-Party-Only cookies.

net/cookies/cookie_options.h

Index: net/cookies/cookie_options.h
diff --git a/net/cookies/cookie_options.h b/net/cookies/cookie_options.h
index 1162c96f1d2d036a65e9e6f548ea1697e345e15d..73488b19b12128892505ec7a298c7e4d06446eb1 100644
--- a/net/cookies/cookie_options.h
+++ b/net/cookies/cookie_options.h
@@ -16,25 +16,30 @@ namespace net {
 
 class NET_EXPORT CookieOptions {
  public:
-  // Default is to exclude httponly completely, and exclude first-party from
-  // being read, which means:
-  // - reading operations will not return httponly or first-party cookies.
-  // - writing operations will not write httponly cookies (first-party will be
-  // written).
+  // Creates a CookieOptions object which:
   //
-  // If a first-party URL is set, then first-party cookies which match that URL
-  // will be returned.
+  // * Excludes HttpOnly cookies
+  // * Excludes First-Party-Only cookies
+  // * Does not enforce prefix restrictions (e.g. "$Secure-*")
+  //
+  // These settings can be altered by calling:
+  //
+  // * |set_{include,exclude}_httponly()|
+  // * |set_include_first_party_only_cookies()|
+  // * |set_enforce_prefixes()|
   CookieOptions();
 
   void set_exclude_httponly() { exclude_httponly_ = true; }
   void set_include_httponly() { exclude_httponly_ = false; }
   bool exclude_httponly() const { return exclude_httponly_; }
 
-  void set_include_first_party_only() { include_first_party_only_ = true; }
-  bool include_first_party_only() const { return include_first_party_only_; }
-
-  void set_first_party(const url::Origin& origin) { first_party_ = origin; }
-  const url::Origin& first_party() const { return first_party_; }
+  // Default is to exclude 'first-party-only' cookies.
+  void set_include_first_party_only_cookies() {
+    include_first_party_only_cookies_ = true;
+  }
+  bool include_first_party_only_cookies() const {
+    return include_first_party_only_cookies_;
+  }
 
   // TODO(estark): Remove once we decide whether to ship cookie
   // prefixes. https://crbug.com/541511
@@ -52,8 +57,7 @@ class NET_EXPORT CookieOptions {
 
  private:
   bool exclude_httponly_;
-  bool include_first_party_only_;
-  url::Origin first_party_;
+  bool include_first_party_only_cookies_;
   bool enforce_prefixes_;
   base::Time server_time_;
 };