7 files changed, 28 insertions, 26 deletions
diff --git a/chrome/browser/android/cookies/cookies_fetcher.cc b/chrome/browser/android/cookies/cookies_fetcher.cc
index b419a48..4a1455d 100644
--- a/chrome/browser/android/cookies/cookies_fetcher.cc
+++ b/chrome/browser/android/cookies/cookies_fetcher.cc
@@ -85,7 +85,7 @@ void CookiesFetcher::OnCookiesFetchFinished(const net::CookieList& cookies) {
         base::android::ConvertUTF8ToJavaString(env, i->Path()).obj(),
         i->CreationDate().ToInternalValue(), i->ExpiryDate().ToInternalValue(),
         i->LastAccessDate().ToInternalValue(), i->IsSecure(), i->IsHttpOnly(),
-        i->IsSameSite(), i->Priority());
+        static_cast<int>(i->SameSite()), i->Priority());
     env->SetObjectArrayElement(joa.obj(), index++, java_cookie.obj());
   }
 
@@ -107,7 +107,7 @@ void CookiesFetcher::RestoreCookies(JNIEnv* env,
                                     int64_t last_access,
                                     bool secure,
                                     bool httponly,
-                                    bool same_site,
+                                    int same_site,
                                     int priority) {
   Profile* profile = ProfileManager::GetPrimaryUserProfile();
   if (!profile->HasOffTheRecordProfile()) {
@@ -126,7 +126,8 @@ void CookiesFetcher::RestoreCookies(JNIEnv* env,
       base::android::ConvertJavaStringToUTF8(env, path),
       base::Time::FromInternalValue(creation),
       base::Time::FromInternalValue(expiration),
-      base::Time::FromInternalValue(last_access), secure, httponly, same_site,
+      base::Time::FromInternalValue(last_access), secure, httponly,
+      static_cast<net::CookieSameSite>(same_site),
       static_cast<net::CookiePriority>(priority));
 
   // The rest must be done from the IO thread.
@@ -162,7 +163,7 @@ void CookiesFetcher::RestoreToCookieJarInternal(
   store->SetCookieWithDetailsAsync(
       cookie.Source(), cookie.Name(), cookie.Value(), cookie.Domain(),
       cookie.Path(), base::Time(), cookie.ExpiryDate(), cookie.LastAccessDate(),
-      cookie.IsSecure(), cookie.IsHttpOnly(), cookie.IsSameSite(),
+      cookie.IsSecure(), cookie.IsHttpOnly(), cookie.SameSite(),
       experimental_features_enabled, cookie.Priority(), cb);
 }
 
diff --git a/chrome/browser/android/cookies/cookies_fetcher.h b/chrome/browser/android/cookies/cookies_fetcher.h
index 32cf204..9b4108e 100644
--- a/chrome/browser/android/cookies/cookies_fetcher.h
+++ b/chrome/browser/android/cookies/cookies_fetcher.h
@@ -50,7 +50,7 @@ class CookiesFetcher {
                       int64_t last_access,
                       bool secure,
                       bool httponly,
-                      bool firstpartyonly,
+                      int samesite,
                       int priority);
 
  private:
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 79befce..a904d1b 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -993,11 +993,11 @@ CookiesTreeModel::~CookiesTreeModel() {
 // static
 int CookiesTreeModel::GetSendForMessageID(const net::CanonicalCookie& cookie) {
   if (cookie.IsSecure()) {
-    if (cookie.IsSameSite())
+    if (cookie.SameSite() != net::CookieSameSite::NO_RESTRICTION)
       return IDS_COOKIES_COOKIE_SENDFOR_SECURE_SAME_SITE;
     return IDS_COOKIES_COOKIE_SENDFOR_SECURE;
   }
-  if (cookie.IsSameSite())
+  if (cookie.SameSite() != net::CookieSameSite::NO_RESTRICTION)
     return IDS_COOKIES_COOKIE_SENDFOR_SAME_SITE;
   return IDS_COOKIES_COOKIE_SENDFOR_ANY;
 }
diff --git a/chrome/browser/chromeos/login/profile_auth_data.cc b/chrome/browser/chromeos/login/profile_auth_data.cc
index 482988a..c66f2e8 100644
--- a/chrome/browser/chromeos/login/profile_auth_data.cc
+++ b/chrome/browser/chromeos/login/profile_auth_data.cc
@@ -50,7 +50,7 @@ void ImportCookies(const net::CookieList& cookies,
     cookie_store->SetCookieWithDetailsAsync(
         cookie.Source(), cookie.Name(), cookie.Value(), domain, cookie.Path(),
         cookie.CreationDate(), cookie.ExpiryDate(), cookie.LastAccessDate(),
-        cookie.IsSecure(), cookie.IsHttpOnly(), cookie.IsSameSite(),
+        cookie.IsSecure(), cookie.IsHttpOnly(), cookie.SameSite(),
         // enforce_strict_secure should have been applied on the original
         // cookie, prior to import.
         false, cookie.Priority(), net::CookieStore::SetCookiesCallback());
diff --git a/chrome/browser/chromeos/login/profile_auth_data_unittest.cc b/chrome/browser/chromeos/login/profile_auth_data_unittest.cc
index 5626ad9..b4729554 100644
--- a/chrome/browser/chromeos/login/profile_auth_data_unittest.cc
+++ b/chrome/browser/chromeos/login/profile_auth_data_unittest.cc
@@ -221,12 +221,12 @@ void ProfileAuthDataTest::PopulateBrowserContext(
   cookies->SetCookieWithDetailsAsync(
       GURL(kSAMLIdPCookieURL), kCookieName, cookie_value, std::string(),
       std::string(), base::Time(), base::Time(), base::Time(), true, false,
-      false, false, net::COOKIE_PRIORITY_DEFAULT,
+      net::CookieSameSite::DEFAULT_MODE, false, net::COOKIE_PRIORITY_DEFAULT,
       net::CookieStore::SetCookiesCallback());
   cookies->SetCookieWithDetailsAsync(
       GURL(kGAIACookieURL), kCookieName, cookie_value, std::string(),
       std::string(), base::Time(), base::Time(), base::Time(), true, false,
-      false, false, net::COOKIE_PRIORITY_DEFAULT,
+      net::CookieSameSite::DEFAULT_MODE, false, net::COOKIE_PRIORITY_DEFAULT,
       net::CookieStore::SetCookiesCallback());
 
   GetChannelIDs(browser_context)
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc
index 7d3d1e0..06de160 100644
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -395,9 +395,7 @@ void CookiesSetFunction::SetCookieOnIOThread() {
                                          : std::string(),
       parsed_args_->details.path.get() ? *parsed_args_->details.path
                                        : std::string(),
-      base::Time(),
-      expiration_time,
-      base::Time(),
+      base::Time(), expiration_time, base::Time(),
       parsed_args_->details.secure.get() ? *parsed_args_->details.secure.get()
                                          : false,
       parsed_args_->details.http_only.get() ? *parsed_args_->details.http_only
@@ -405,8 +403,8 @@ void CookiesSetFunction::SetCookieOnIOThread() {
       // TODO(mkwst): If we decide to ship First-party-only cookies, we'll need
       // to extend the extension API to support them. For the moment, we'll set
       // all cookies as non-First-party-only.
-      false, are_experimental_cookie_features_enabled,
-      net::COOKIE_PRIORITY_DEFAULT,
+      net::CookieSameSite::DEFAULT_MODE,
+      are_experimental_cookie_features_enabled, net::COOKIE_PRIORITY_DEFAULT,
       base::Bind(&CookiesSetFunction::PullCookie, this));
 }
 
diff --git a/chrome/browser/extensions/api/cookies/cookies_unittest.cc b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
index ad3d8e9..41ee79b 100644
--- a/chrome/browser/extensions/api/cookies/cookies_unittest.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
@@ -85,7 +85,8 @@ TEST_F(ExtensionCookiesTest, StoreIdProfileConversion) {
 TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
   net::CanonicalCookie canonical_cookie1(
       GURL(), "ABC", "DEF", "www.foobar.com", "/", base::Time(), base::Time(),
-      base::Time(), false, false, false, net::COOKIE_PRIORITY_DEFAULT);
+      base::Time(), false, false, net::CookieSameSite::DEFAULT_MODE,
+      net::COOKIE_PRIORITY_DEFAULT);
   scoped_ptr<Cookie> cookie1(
       cookies_helpers::CreateCookie(
           canonical_cookie1, "some cookie store"));
@@ -102,8 +103,8 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
 
   net::CanonicalCookie canonical_cookie2(
       GURL(), "ABC", "DEF", ".foobar.com", "/", base::Time(),
-      base::Time::FromDoubleT(10000), base::Time(), false, false, false,
-      net::COOKIE_PRIORITY_DEFAULT);
+      base::Time::FromDoubleT(10000), base::Time(), false, false,
+      net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT);
   scoped_ptr<Cookie> cookie2(
       cookies_helpers::CreateCookie(
           canonical_cookie2, "some cookie store"));
@@ -124,14 +125,16 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
 TEST_F(ExtensionCookiesTest, GetURLFromCanonicalCookie) {
   net::CanonicalCookie cookie1(GURL(), "ABC", "DEF", "www.foobar.com", "/",
                                base::Time(), base::Time(), base::Time(), false,
-                               false, false, net::COOKIE_PRIORITY_DEFAULT);
+                               false, net::CookieSameSite::DEFAULT_MODE,
+                               net::COOKIE_PRIORITY_DEFAULT);
   EXPECT_EQ("http://www.foobar.com/",
             cookies_helpers::GetURLFromCanonicalCookie(
                 cookie1).spec());
 
   net::CanonicalCookie cookie2(GURL(), "ABC", "DEF", ".helloworld.com", "/",
                                base::Time(), base::Time(), base::Time(), true,
-                               false, false, net::COOKIE_PRIORITY_DEFAULT);
+                               false, net::CookieSameSite::DEFAULT_MODE,
+                               net::COOKIE_PRIORITY_DEFAULT);
   EXPECT_EQ("https://helloworld.com/",
             cookies_helpers::GetURLFromCanonicalCookie(
                 cookie2).spec());
@@ -167,10 +170,10 @@ TEST_F(ExtensionCookiesTest, DomainMatching) {
     scoped_ptr<GetAll::Params> params(GetAll::Params::Create(args));
 
     cookies_helpers::MatchFilter filter(&params->details);
-    net::CanonicalCookie cookie(GURL(), std::string(), std::string(),
-                                tests[i].domain, std::string(), base::Time(),
-                                base::Time(), base::Time(), false, false, false,
-                                net::COOKIE_PRIORITY_DEFAULT);
+    net::CanonicalCookie cookie(
+        GURL(), std::string(), std::string(), tests[i].domain, std::string(),
+        base::Time(), base::Time(), base::Time(), false, false,
+        net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT);
     EXPECT_EQ(tests[i].matches, filter.MatchesCookie(cookie));
   }
 }
@@ -178,8 +181,8 @@ TEST_F(ExtensionCookiesTest, DomainMatching) {
 TEST_F(ExtensionCookiesTest, DecodeUTF8WithErrorHandling) {
   net::CanonicalCookie canonical_cookie(
       GURL(), std::string(), "011Q255bNX_1!yd\203e+", "test.com", "/path\203",
-      base::Time(), base::Time(), base::Time(), false, false, false,
-      net::COOKIE_PRIORITY_DEFAULT);
+      base::Time(), base::Time(), base::Time(), false, false,
+      net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT);
   scoped_ptr<Cookie> cookie(
       cookies_helpers::CreateCookie(
           canonical_cookie, "some cookie store"));