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

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 d3d7fd056b71a05cc92e322b10d8d8f7d47991a9..ff7a1c7456ad1536bb3377c6abe814dbc4e3362f 100644
--- a/net/cookies/cookie_options.h
+++ b/net/cookies/cookie_options.h
@@ -10,6 +10,7 @@
 #include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace net {
 
@@ -32,8 +33,8 @@ class NET_EXPORT CookieOptions {
   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_url(const GURL& url) { first_party_url_ = url; }
-  GURL first_party_url() const { return first_party_url_; }
+  void set_first_party(const url::Origin& origin) { first_party_ = origin; }
+  url::Origin first_party() const { return first_party_; }

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

while you're here...const url::Origin&?

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

Makes sense.

 
   // |server_time| indicates what the server sending us the Cookie thought the
   // current time was when the cookie was produced.  This is used to adjust for
@@ -47,7 +48,7 @@ class NET_EXPORT CookieOptions {
  private:
   bool exclude_httponly_;
   bool include_first_party_only_;
-  GURL first_party_url_;
+  url::Origin first_party_;
   base::Time server_time_;
 };