SameSite: Implement 'Strict'/'Lax' attribute parsing.

net/cookies/cookie_monster_unittest.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.
 
 #include "net/cookies/cookie_store_unittest.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 169 matching lines @@
     //    * Three levels of host cookie (w.b.a, w.c.b.a, w.d.c.b.a)
     //    * http_only cookie (w.c.b.a)
     //    * same_site cookie (w.c.b.a)
     //    * Two secure cookies (.c.b.a, w.c.b.a)
     //    * Two domain path cookies (.c.b.a/dir1, .c.b.a/dir1/dir2)
     //    * Two host path cookies (w.c.b.a/dir1, w.c.b.a/dir1/dir2)
 
     // Domain cookies
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_1, "dom_1", "X", ".harvard.edu", "/",
-        base::Time(), base::Time(), base::Time(), false, false, false,
-        COOKIE_PRIORITY_DEFAULT));
+        base::Time(), base::Time(), base::Time(), false, false,
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_2, "dom_2", "X", ".math.harvard.edu", "/",
-        base::Time(), base::Time(), base::Time(), false, false, false,
-        COOKIE_PRIORITY_DEFAULT));
+        base::Time(), base::Time(), base::Time(), false, false,
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_3, "dom_3", "X",
         ".bourbaki.math.harvard.edu", "/", base::Time(), base::Time(),
-        base::Time(), false, false, false, COOKIE_PRIORITY_DEFAULT));
+        base::Time(), false, false, COOKIE_SAME_SITE_DEFAULT,
+        COOKIE_PRIORITY_DEFAULT));
 
     // Host cookies
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_1, "host_1", "X", std::string(), "/",
-        base::Time(), base::Time(), base::Time(), false, false, false,
-        COOKIE_PRIORITY_DEFAULT));
+        base::Time(), base::Time(), base::Time(), false, false,
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_2, "host_2", "X", std::string(), "/",
-        base::Time(), base::Time(), base::Time(), false, false, false,
-        COOKIE_PRIORITY_DEFAULT));
+        base::Time(), base::Time(), base::Time(), false, false,
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_3, "host_3", "X", std::string(), "/",
-        base::Time(), base::Time(), base::Time(), false, false, false,
-        COOKIE_PRIORITY_DEFAULT));
+        base::Time(), base::Time(), base::Time(), false, false,
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
 
     // http_only cookie
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_2, "httpo_check", "x", std::string(), "/",
-        base::Time(), base::Time(), base::Time(), false, true, false,
-        COOKIE_PRIORITY_DEFAULT));
+        base::Time(), base::Time(), base::Time(), false, true,
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
 
     // same-site cookie
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_2, "firstp_check", "x", std::string(),
-        "/", base::Time(), base::Time(), base::Time(), false, false, true,
-        COOKIE_PRIORITY_DEFAULT));
+        "/", base::Time(), base::Time(), base::Time(), false, false,
+        COOKIE_SAME_SITE_STRICT, COOKIE_PRIORITY_DEFAULT));
 
     // Secure cookies
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_2_secure, "sec_dom", "X",
         ".math.harvard.edu", "/", base::Time(), base::Time(), base::Time(),
-        true, false, false, COOKIE_PRIORITY_DEFAULT));
+        true, false, COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_2_secure, "sec_host", "X", std::string(),
-        "/", base::Time(), base::Time(), base::Time(), true, false, false,
-        COOKIE_PRIORITY_DEFAULT));
+        "/", base::Time(), base::Time(), base::Time(), true, false,
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
 
     // Domain path cookies
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_2, "dom_path_1", "X", ".math.harvard.edu",
-        "/dir1", base::Time(), base::Time(), base::Time(), false, false, false,
-        COOKIE_PRIORITY_DEFAULT));
+        "/dir1", base::Time(), base::Time(), base::Time(), false, false,
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_2, "dom_path_2", "X", ".math.harvard.edu",
         "/dir1/dir2", base::Time(), base::Time(), base::Time(), false, false,
-        false, COOKIE_PRIORITY_DEFAULT));
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
 
     // Host path cookies
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_2, "host_path_1", "X", std::string(),
-        "/dir1", base::Time(), base::Time(), base::Time(), false, false, false,
-        COOKIE_PRIORITY_DEFAULT));
+        "/dir1", base::Time(), base::Time(), base::Time(), false, false,
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
     EXPECT_TRUE(this->SetCookieWithDetails(
         cm, url_top_level_domain_plus_2, "host_path_2", "X", std::string(),
         "/dir1/dir2", base::Time(), base::Time(), base::Time(), false, false,
-        false, COOKIE_PRIORITY_DEFAULT));
+        COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
 
     EXPECT_EQ(14U, this->GetAllCookies(cm).size());
   }
 
   Time GetFirstCookieAccessDate(CookieMonster* cm) {
     const CookieList all_cookies(this->GetAllCookies(cm));
     return all_cookies.front().LastAccessDate();
   }
 
   bool FindAndDeleteCookie(CookieMonster* cm,
@@ skipping 348 matching lines @@
 
 struct CookiesInputInfo {
   const GURL url;
   const std::string name;
   const std::string value;
   const std::string domain;
   const std::string path;
   const base::Time expiration_time;
   bool secure;
   bool http_only;
-  bool same_site;
+  CookieSameSite same_site;
   CookiePriority priority;
 };
 
 ACTION_P(QuitRunLoop, run_loop) {
   run_loop->Quit();
 }
 
 // TODO(erikwright): When the synchronous helpers 'GetCookies' etc. are removed,
 // rename these, removing the 'Action' suffix.
 ACTION_P4(DeleteCookieAction, cookie_monster, url, name, callback) {
@@ skipping 212 matching lines @@
   base::RunLoop loop;
   EXPECT_CALL(set_cookies_callback, Invoke(true)).WillOnce(QuitRunLoop(&loop));
 
   CompleteLoading();
   loop.Run();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredSetAllCookies) {
   MockSetCookiesCallback set_cookies_callback;
   CookieList list;
-  list.push_back(CanonicalCookie(http_www_google_.url(), "A", "B",
-                                 http_www_google_.domain(), "/",
-                                 base::Time::Now(), base::Time(), base::Time(),
-                                 false, true, false, COOKIE_PRIORITY_DEFAULT));
-  list.push_back(CanonicalCookie(http_www_google_.url(), "C", "D",
-                                 http_www_google_.domain(), "/",
-                                 base::Time::Now(), base::Time(), base::Time(),
-                                 false, true, false, COOKIE_PRIORITY_DEFAULT));
+  list.push_back(CanonicalCookie(
+      http_www_google_.url(), "A", "B", http_www_google_.domain(), "/",
+      base::Time::Now(), base::Time(), base::Time(), false, true,
+      COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT));

[mmenke, 2016/03/11 18:08:31]

You're using NONE here, but DEFAULT above.  Is there a reason for this?

[Mike West, 2016/03/14 10:18:54]

No. No good reason, here or elsewhere.

+  list.push_back(CanonicalCookie(
+      http_www_google_.url(), "C", "D", http_www_google_.domain(), "/",
+      base::Time::Now(), base::Time(), base::Time(), false, true,
+      COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT));
 
   BeginWith(
       SetAllCookiesAction(&cookie_monster(), list, &set_cookies_callback));
 
   WaitForLoadCall();
 
   EXPECT_CALL(set_cookies_callback, Invoke(true))
       .WillOnce(
           SetAllCookiesAction(&cookie_monster(), list, &set_cookies_callback));
   base::RunLoop loop;
@@ skipping 27 matching lines @@
   MockSetCookiesCallback set_cookies_callback;
 
   CookiesInputInfo cookie_info = {www_google_foo_.url(),
                                   "A",
                                   "B",
                                   std::string(),
                                   "/foo",
                                   base::Time(),
                                   false,
                                   false,
-                                  false,
+                                  COOKIE_SAME_SITE_DEFAULT,
                                   COOKIE_PRIORITY_DEFAULT};
   BeginWithForDomainKey(
       http_www_google_.domain(),
       SetCookieWithDetailsAction(&cookie_monster(), cookie_info,
                                  &set_cookies_callback));
 
   WaitForLoadCall();
 
   CookiesInputInfo cookie_info_exp = {www_google_foo_.url(),
                                       "A",
                                       "B",
                                       std::string(),
                                       "/foo",
                                       base::Time(),
                                       false,
                                       false,
-                                      false,
+                                      COOKIE_SAME_SITE_DEFAULT,
                                       COOKIE_PRIORITY_DEFAULT};
   EXPECT_CALL(set_cookies_callback, Invoke(true))
       .WillOnce(SetCookieWithDetailsAction(&cookie_monster(), cookie_info_exp,
                                            &set_cookies_callback));
   base::RunLoop loop;
   EXPECT_CALL(set_cookies_callback, Invoke(true)).WillOnce(QuitRunLoop(&loop));
 
   CompleteLoading();
   loop.Run();
 }
@@ skipping 795 matching lines @@
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
                                    "setCookieWithOptions1=A", options));
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
                                    "setCookieWithOptions2=A", options));
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
                                    "setCookieWithOptions3=A", options));
 
   EXPECT_TRUE(SetCookieWithDetails(
       cm.get(), http_www_google_.url(), "setCookieWithDetails1", "A",
       http_www_google_.Format(".%D"), "/", Time(), Time(), Time(), false, false,
-      false, COOKIE_PRIORITY_DEFAULT));
+      COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
   EXPECT_TRUE(SetCookieWithDetails(
       cm.get(), http_www_google_.url(), "setCookieWithDetails2", "A",
       http_www_google_.Format(".%D"), "/", Time(), Time(), Time(), false, false,
-      false, COOKIE_PRIORITY_DEFAULT));
+      COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
   EXPECT_TRUE(SetCookieWithDetails(
       cm.get(), http_www_google_.url(), "setCookieWithDetails3", "A",
       http_www_google_.Format(".%D"), "/", Time(), Time(), Time(), false, false,
-      false, COOKIE_PRIORITY_DEFAULT));
+      COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
 
   // Now we check
   CookieList cookie_list(GetAllCookies(cm.get()));
   EXPECT_EQ(9u, cookie_list.size());
   typedef std::map<int64_t, CanonicalCookie> TimeCookieMap;
   TimeCookieMap check_map;
   for (CookieList::const_iterator it = cookie_list.begin();
        it != cookie_list.end(); it++) {
     const int64_t creation_date = it->CreationDate().ToInternalValue();
     TimeCookieMap::const_iterator existing_cookie_it(
@@ skipping 39 matching lines @@
 TEST_F(CookieMonsterTest, BackingStoreCommunication) {
   // Store details for cookies transforming through the backing store interface.
 
   base::Time current(base::Time::Now());
   scoped_refptr<MockSimplePersistentCookieStore> store(
       new MockSimplePersistentCookieStore);
   base::Time new_access_time;
   base::Time expires(base::Time::Now() + base::TimeDelta::FromSeconds(100));
 
   const CookiesInputInfo input_info[] = {
-      {GURL("http://a.b.google.com"),
-       "a",
-       "1",
-       "",
-       "/path/to/cookie",
-       expires,
-       false,
-       false,
-       false,
-       COOKIE_PRIORITY_DEFAULT},
-      {GURL("https://www.google.com"),
-       "b",
-       "2",
-       ".google.com",
-       "/path/from/cookie",
-       expires + TimeDelta::FromSeconds(10),
-       true,
-       true,
-       false,
-       COOKIE_PRIORITY_DEFAULT},
-      {GURL("https://google.com"),
-       "c",
-       "3",
-       "",
-       "/another/path/to/cookie",
-       base::Time::Now() + base::TimeDelta::FromSeconds(100),
-       true,
-       false,
-       true,
-       COOKIE_PRIORITY_DEFAULT}};
+      {GURL("http://a.b.google.com"), "a", "1", "", "/path/to/cookie", expires,
+       false, false, COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT},
+      {GURL("https://www.google.com"), "b", "2", ".google.com",
+       "/path/from/cookie", expires + TimeDelta::FromSeconds(10), true, true,
+       COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT},
+      {GURL("https://google.com"), "c", "3", "", "/another/path/to/cookie",
+       base::Time::Now() + base::TimeDelta::FromSeconds(100), true, false,
+       COOKIE_SAME_SITE_STRICT, COOKIE_PRIORITY_DEFAULT}};
   const int INPUT_DELETE = 1;
 
   // Create new cookies and flush them to the store.
   {
     scoped_ptr<CookieMonster> cmout(new CookieMonster(store.get(), nullptr));
     for (const CookiesInputInfo* p = input_info;
          p < &input_info[arraysize(input_info)]; p++) {
       EXPECT_TRUE(SetCookieWithDetails(
           cmout.get(), p->url, p->name, p->value, p->domain, p->path,
           base::Time(), p->expiration_time, base::Time(), p->secure,
@@ skipping 19 matching lines @@
       const CanonicalCookie* output = &cookies[output_index];
 
       EXPECT_EQ(input->name, output->Name());
       EXPECT_EQ(input->value, output->Value());
       EXPECT_EQ(input->url.host(), output->Domain());
       EXPECT_EQ(input->path, output->Path());
       EXPECT_LE(current.ToInternalValue(),
                 output->CreationDate().ToInternalValue());
       EXPECT_EQ(input->secure, output->IsSecure());
       EXPECT_EQ(input->http_only, output->IsHttpOnly());
-      EXPECT_EQ(input->same_site, output->IsSameSite());
+      EXPECT_EQ(input->same_site, output->SameSite());
       EXPECT_TRUE(output->IsPersistent());
       EXPECT_EQ(input->expiration_time.ToInternalValue(),
                 output->ExpiryDate().ToInternalValue());
     }
   }
 }
 
 TEST_F(CookieMonsterTest, CookieListOrdering) {
   // Put a random set of cookies into a monster and make sure
   // they're returned in the right order.
@@ skipping 415 matching lines @@
 TEST_F(CookieMonsterTest, SetAllCookies) {
   scoped_refptr<FlushablePersistentStore> store(new FlushablePersistentStore());
   scoped_ptr<CookieMonster> cm(new CookieMonster(store.get(), nullptr));
   cm->SetPersistSessionCookies(true);
 
   EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "U=V; path=/"));
   EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "W=X; path=/foo"));
   EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "Y=Z; path=/"));
 
   CookieList list;
-  list.push_back(CanonicalCookie(http_www_google_.url(), "A", "B",
-                                 http_www_google_.url().host(), "/",
-                                 base::Time::Now(), base::Time(), base::Time(),
-                                 false, false, false, COOKIE_PRIORITY_DEFAULT));
-  list.push_back(CanonicalCookie(http_www_google_.url(), "W", "X",
-                                 http_www_google_.url().host(), "/bar",
-                                 base::Time::Now(), base::Time(), base::Time(),
-                                 false, false, false, COOKIE_PRIORITY_DEFAULT));
-  list.push_back(CanonicalCookie(http_www_google_.url(), "Y", "Z",
-                                 http_www_google_.url().host(), "/",
-                                 base::Time::Now(), base::Time(), base::Time(),
-                                 false, false, false, COOKIE_PRIORITY_DEFAULT));
+  list.push_back(CanonicalCookie(
+      http_www_google_.url(), "A", "B", http_www_google_.url().host(), "/",
+      base::Time::Now(), base::Time(), base::Time(), false, false,
+      COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT));
+  list.push_back(CanonicalCookie(
+      http_www_google_.url(), "W", "X", http_www_google_.url().host(), "/bar",
+      base::Time::Now(), base::Time(), base::Time(), false, false,
+      COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT));
+  list.push_back(CanonicalCookie(
+      http_www_google_.url(), "Y", "Z", http_www_google_.url().host(), "/",
+      base::Time::Now(), base::Time(), base::Time(), false, false,
+      COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT));
 
   // SetAllCookies must not flush.
   ASSERT_EQ(0, store->flush_count());
   EXPECT_TRUE(SetAllCookies(cm.get(), list));
   EXPECT_EQ(0, store->flush_count());
 
   CookieList cookies = GetAllCookies(cm.get());
   size_t expected_size = 3;  // "A", "W" and "Y". "U" is gone.
   EXPECT_EQ(expected_size, cookies.size());
   CookieList::iterator it = cookies.begin();
@@ skipping 13 matching lines @@
 }
 
 TEST_F(CookieMonsterTest, ComputeCookieDiff) {
   scoped_ptr<CookieMonster> cm(new CookieMonster(nullptr, nullptr));
 
   base::Time now = base::Time::Now();
   base::Time creation_time = now - base::TimeDelta::FromSeconds(1);
 
   CanonicalCookie cookie1(http_www_google_.url(), "A", "B",
                           http_www_google_.url().host(), "/", creation_time,
-                          base::Time(), base::Time(), false, false, false,
-                          COOKIE_PRIORITY_DEFAULT);
+                          base::Time(), base::Time(), false, false,
+                          COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);

[mmenke, 2016/03/11 18:08:31]

And now you're back to none again.  Should be consistent, unless there's a
reason not to be.

   CanonicalCookie cookie2(http_www_google_.url(), "C", "D",
                           http_www_google_.url().host(), "/", creation_time,
-                          base::Time(), base::Time(), false, false, false,
-                          COOKIE_PRIORITY_DEFAULT);
+                          base::Time(), base::Time(), false, false,
+                          COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);
   CanonicalCookie cookie3(http_www_google_.url(), "E", "F",
                           http_www_google_.url().host(), "/", creation_time,
-                          base::Time(), base::Time(), false, false, false,
-                          COOKIE_PRIORITY_DEFAULT);
+                          base::Time(), base::Time(), false, false,
+                          COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);
   CanonicalCookie cookie4(http_www_google_.url(), "G", "H",
                           http_www_google_.url().host(), "/", creation_time,
-                          base::Time(), base::Time(), false, false, false,
-                          COOKIE_PRIORITY_DEFAULT);
+                          base::Time(), base::Time(), false, false,
+                          COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);
   CanonicalCookie cookie4_with_new_value(
       http_www_google_.url(), "G", "iamnew", http_www_google_.url().host(), "/",
-      creation_time, base::Time(), base::Time(), false, false, false,
-      COOKIE_PRIORITY_DEFAULT);
+      creation_time, base::Time(), base::Time(), false, false,
+      COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);
   CanonicalCookie cookie5(http_www_google_.url(), "I", "J",
                           http_www_google_.url().host(), "/", creation_time,
-                          base::Time(), base::Time(), false, false, false,
-                          COOKIE_PRIORITY_DEFAULT);
+                          base::Time(), base::Time(), false, false,
+                          COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);
   CanonicalCookie cookie5_with_new_creation_time(
       http_www_google_.url(), "I", "J", http_www_google_.url().host(), "/", now,
-      base::Time(), base::Time(), false, false, false, COOKIE_PRIORITY_DEFAULT);
+      base::Time(), base::Time(), false, false, COOKIE_SAME_SITE_NONE,
+      COOKIE_PRIORITY_DEFAULT);
   CanonicalCookie cookie6(http_www_google_.url(), "K", "L",
                           http_www_google_.url().host(), "/foo", creation_time,
-                          base::Time(), base::Time(), false, false, false,
-                          COOKIE_PRIORITY_DEFAULT);
+                          base::Time(), base::Time(), false, false,
+                          COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);
   CanonicalCookie cookie6_with_new_path(
       http_www_google_.url(), "K", "L", http_www_google_.url().host(), "/bar",
-      creation_time, base::Time(), base::Time(), false, false, false,
-      COOKIE_PRIORITY_DEFAULT);
+      creation_time, base::Time(), base::Time(), false, false,
+      COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);
   CanonicalCookie cookie7(http_www_google_.url(), "M", "N",
                           http_www_google_.url().host(), "/foo", creation_time,
-                          base::Time(), base::Time(), false, false, false,
-                          COOKIE_PRIORITY_DEFAULT);
+                          base::Time(), base::Time(), false, false,
+                          COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);
   CanonicalCookie cookie7_with_new_path(
       http_www_google_.url(), "M", "N", http_www_google_.url().host(), "/bar",
-      creation_time, base::Time(), base::Time(), false, false, false,
-      COOKIE_PRIORITY_DEFAULT);
+      creation_time, base::Time(), base::Time(), false, false,
+      COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);
 
   CookieList old_cookies;
   old_cookies.push_back(cookie1);
   old_cookies.push_back(cookie2);
   old_cookies.push_back(cookie4);
   old_cookies.push_back(cookie5);
   old_cookies.push_back(cookie6);
   old_cookies.push_back(cookie7);
 
   CookieList new_cookies;
@@ skipping 73 matching lines @@
   // above.
   base::HistogramBase* expired_histogram = base::Histogram::FactoryGet(
       "Cookie.ExpirationDurationMinutes", 1, 10 * 365 * 24 * 60, 50,
       base::Histogram::kUmaTargetedHistogramFlag);
 
   scoped_ptr<base::HistogramSamples> samples1(
       expired_histogram->SnapshotSamples());
   ASSERT_TRUE(SetCookieWithDetails(
       cm.get(), GURL("http://fake.a.url"), "a", "b", "a.url", "/", base::Time(),
       base::Time::Now() + base::TimeDelta::FromMinutes(59), base::Time(), false,
-      false, false, COOKIE_PRIORITY_DEFAULT));
+      false, COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT));
 
   scoped_ptr<base::HistogramSamples> samples2(
       expired_histogram->SnapshotSamples());
   EXPECT_EQ(samples1->TotalCount() + 1, samples2->TotalCount());
 
   // kValidCookieLine creates a session cookie.
   ASSERT_TRUE(SetCookie(cm.get(), http_www_google_.url(), kValidCookieLine));
 
   scoped_ptr<base::HistogramSamples> samples3(
       expired_histogram->SnapshotSamples());
@@ skipping 101 matching lines @@
   std::vector<CanonicalCookie*> initial_cookies;
 
   AddCookieToList(domain, "foo=bar; path=" + path, now1, &initial_cookies);
 
   // We have to manually build this cookie because it contains a control
   // character, and our cookie line parser rejects control characters.
   CanonicalCookie* cc =
       new CanonicalCookie(url, "baz",
                           "\x05"
                           "boo",
-                          domain, path, now2, later, now2, false, false, false,
-                          COOKIE_PRIORITY_DEFAULT);
+                          domain, path, now2, later, now2, false, false,
+                          COOKIE_SAME_SITE_NONE, COOKIE_PRIORITY_DEFAULT);
   initial_cookies.push_back(cc);
 
   AddCookieToList(domain, "hello=world; path=" + path, now3, &initial_cookies);
 
   // Inject our initial cookies into the mock PersistentCookieStore.
   store->SetLoadExpectation(true, initial_cookies);
 
   scoped_ptr<CookieMonster> cm(new CookieMonster(store.get(), nullptr));
 
   EXPECT_EQ("foo=bar; hello=world", GetCookies(cm.get(), url));
@@ skipping 575 matching lines @@
       monster()->AddCallbackForCookie(
           test_url_, "abc",
           base::Bind(&RecordCookieChanges, &cookies1, nullptr)));
   SetCookie(monster(), test_url_, "abc=def");
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(1U, cookies0.size());
   EXPECT_EQ(1U, cookies0.size());
 }
 
 }  // namespace net