SameSite: Strict/Lax behavior.

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 801e958e268fac854f9bf784823704227e06ab4f..bfeb00d98b72e15dbc7d986372821bd38685d746 100644
--- a/net/cookies/cookie_options.h
+++ b/net/cookies/cookie_options.h
@@ -9,6 +9,7 @@
 
 #include "base/time/time.h"
 #include "net/base/net_export.h"
+#include "net/cookies/cookie_constants.h"
 #include "url/gurl.h"
 
 namespace net {
@@ -25,7 +26,7 @@ class NET_EXPORT CookieOptions {
   // These settings can be altered by calling:
   //
   // * |set_{include,exclude}_httponly()|
-  // * |set_include_same_site()|
+  // * |set_include_same_site(CookieSameSite::STRICT_MODE)|
   // * |set_enforce_prefixes()|
   // * |set_do_not_update_access_time()|
   CookieOptions();
@@ -35,8 +36,8 @@ class NET_EXPORT CookieOptions {
   bool exclude_httponly() const { return exclude_httponly_; }
 
   // Default is to exclude 'same_site' cookies.
-  void set_include_same_site() { include_same_site_ = true; }
-  bool include_same_site() const { return include_same_site_; }
+  void set_include_same_site(CookieSameSite type) { include_same_site_ = type; }
+  CookieSameSite include_same_site() const { return include_same_site_; }

[Mike West, 2016/03/14 15:24:10]

TODO(me): Rename this to something like
`set_which_same_site_cookies_should_be_included` but shorter and sane.

 
   // TODO(jww): Remove once we decide whether to ship modifying 'secure' cookies
   // only from secure schemes. https://crbug.com/546820
@@ -57,7 +58,7 @@ class NET_EXPORT CookieOptions {
 
  private:
   bool exclude_httponly_;
-  bool include_same_site_;
+  CookieSameSite include_same_site_;
   bool enforce_strict_secure_;
   bool update_access_time_;
   base::Time server_time_;