Update some browsing_data tests to work with SameSite-by-default cookies

This change updates some tests in //content/browser/browsing_data and
//chrome/browser/browsing_data to work with SameSiteByDefaultCookies
and CookiesWithoutSameSiteMustBeSecure. In particular, since by default
cookies will be treated as SameSite=Lax, setting cookies requires a
CookieOptions object with an appropriate SameSite context. Also,
cookies with SameSite=None (NO_RESTRICTION) must also be Secure.

Bug: 1006816
Change-Id: I9fbc55bebe2455478392a21eb63994ba53467273
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1830286Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Commit-Queue: Lily Chen <chlily@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701525}

chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc

@@ -121,9 +121,11 @@ class BrowsingDataCookieHelperTest : public testing::Test {
 
     network::mojom::CookieManager* cookie_manager =
         storage_partition()->GetCookieManagerForBrowserProcess();
-    cookie_manager->SetCanonicalCookie(*cookie1, "https", net::CookieOptions(),
+    cookie_manager->SetCanonicalCookie(*cookie1, "https",
+                                       net::CookieOptions::MakeAllInclusive(),
                                        base::DoNothing());
-    cookie_manager->SetCanonicalCookie(*cookie2, "https", net::CookieOptions(),
+    cookie_manager->SetCanonicalCookie(*cookie2, "https",
+                                       net::CookieOptions::MakeAllInclusive(),
                                        base::DoNothing());
   }
 
@@ -137,9 +139,11 @@ class BrowsingDataCookieHelperTest : public testing::Test {
 
     network::mojom::CookieManager* cookie_manager =
         storage_partition()->GetCookieManagerForBrowserProcess();
-    cookie_manager->SetCanonicalCookie(*cookie1, "https", net::CookieOptions(),
+    cookie_manager->SetCanonicalCookie(*cookie1, "https",
+                                       net::CookieOptions::MakeAllInclusive(),
                                        base::DoNothing());
-    cookie_manager->SetCanonicalCookie(*cookie2, "https", net::CookieOptions(),
+    cookie_manager->SetCanonicalCookie(*cookie2, "https",
+                                       net::CookieOptions::MakeAllInclusive(),
                                        base::DoNothing());
   }
 

content/browser/browsing_data/browsing_data_test_utils.cc

@@ -31,6 +31,7 @@ void CreateCookieForTest(
     const std::string& cookie_domain,
     net::CookieSameSite same_site,
     net::CookieOptions::SameSiteCookieContext cookie_context,
+    bool is_cookie_secure,
     BrowserContext* browser_context) {
   base::RunLoop run_loop;
   net::CookieOptions options;
@@ -39,8 +40,9 @@ void CreateCookieForTest(
   GetCookieManager(browser_context)
       ->SetCanonicalCookie(
           net::CanonicalCookie(cookie_name, "1", cookie_domain, "/",
-                               base::Time(), base::Time(), base::Time(), false,
-                               false, same_site, net::COOKIE_PRIORITY_LOW),
+                               base::Time(), base::Time(), base::Time(),
+                               is_cookie_secure, false, same_site,
+                               net::COOKIE_PRIORITY_LOW),
           "https", options,
           base::BindLambdaForTesting([&](CookieInclusionStatus result) {
             result_out = result.IsInclude();

content/browser/browsing_data/browsing_data_test_utils.h

@@ -21,6 +21,7 @@ void CreateCookieForTest(
     const std::string& cookie_domain,
     net::CookieSameSite same_site,
     net::CookieOptions::SameSiteCookieContext cookie_context,
+    bool is_cookie_secure,
     BrowserContext* browser_context);
 
 std::vector<net::CanonicalCookie> GetAllCookies(

content/browser/browsing_data/clear_site_data_handler_browsertest.cc

@@ -176,7 +176,7 @@ class ClearSiteDataHandlerBrowserTest : public ContentBrowserTest {
 
     base::RunLoop run_loop;
     cookie_manager->SetCanonicalCookie(
-        *cookie, url.scheme(), net::CookieOptions(),
+        *cookie, url.scheme(), net::CookieOptions::MakeAllInclusive(),
         base::BindOnce(&ClearSiteDataHandlerBrowserTest::AddCookieCallback,
                        run_loop.QuitClosure()));
     run_loop.Run();

content/browser/browsing_data/same_site_data_remover_impl_browsertest.cc

@@ -99,7 +99,7 @@ IN_PROC_BROWSER_TEST_F(SameSiteDataRemoverBrowserTest,
   CreateCookieForTest("TestCookie", "www.google.com",
                       net::CookieSameSite::NO_RESTRICTION,
                       net::CookieOptions::SameSiteCookieContext::CROSS_SITE,
-                      GetBrowserContext());
+                      true /* is_cookie_secure */, GetBrowserContext());
   browsing_data_browsertest_utils::AddServiceWorker(
       "www.google.com", storage_partition, GetHttpsServer());
 
@@ -122,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(SameSiteDataRemoverBrowserTest,
   CreateCookieForTest("TestCookie", "www.google.com",
                       net::CookieSameSite::NO_RESTRICTION,
                       net::CookieOptions::SameSiteCookieContext::CROSS_SITE,
-                      GetBrowserContext());
+                      true /* is_cookie_secure */, GetBrowserContext());
   browsing_data_browsertest_utils::AddServiceWorker(
       "www.google.com", storage_partition, GetHttpsServer());
 

content/browser/browsing_data/same_site_data_remover_impl_unittest.cc

@@ -107,13 +107,14 @@ class SameSiteDataRemoverImplTest : public testing::Test {
 TEST_F(SameSiteDataRemoverImplTest, TestRemoveSameSiteNoneCookies) {
   BrowserContext* browser_context = GetBrowserContext();
 
-  CreateCookieForTest(
-      "TestCookie1", "www.google.com", net::CookieSameSite::NO_RESTRICTION,
-      net::CookieOptions::SameSiteCookieContext::CROSS_SITE, browser_context);
+  CreateCookieForTest("TestCookie1", "www.google.com",
+                      net::CookieSameSite::NO_RESTRICTION,
+                      net::CookieOptions::SameSiteCookieContext::CROSS_SITE,
+                      true /* is_cookie_secure */, browser_context);
   CreateCookieForTest("TestCookie2", "www.gmail.google.com",
                       net::CookieSameSite::NO_RESTRICTION,
                       net::CookieOptions::SameSiteCookieContext::CROSS_SITE,
-                      browser_context);
+                      true /* is_cookie_secure */, browser_context);
 
   DeleteSameSiteNoneCookies();
 
@@ -127,14 +128,15 @@ TEST_F(SameSiteDataRemoverImplTest, TestRemoveSameSiteNoneCookies) {
 
 TEST_F(SameSiteDataRemoverImplTest, TestRemoveOnlySameSiteNoneCookies) {
   BrowserContext* browser_context = GetBrowserContext();
-  CreateCookieForTest(
-      "TestCookie1", "www.google.com", net::CookieSameSite::NO_RESTRICTION,
-      net::CookieOptions::SameSiteCookieContext::CROSS_SITE, browser_context);
+  CreateCookieForTest("TestCookie1", "www.google.com",
+                      net::CookieSameSite::NO_RESTRICTION,
+                      net::CookieOptions::SameSiteCookieContext::CROSS_SITE,
+                      true /* is_cookie_secure */, browser_context);
   // The second cookie has SameSite value STRICT_MODE instead of NO_RESTRICTION.
   CreateCookieForTest(
       "TestCookie2", "www.gmail.google.com", net::CookieSameSite::STRICT_MODE,
       net::CookieOptions::SameSiteCookieContext::SAME_SITE_STRICT,
-      browser_context);
+      true /* is_cookie_secure */, browser_context);
 
   DeleteSameSiteNoneCookies();
 
@@ -149,15 +151,16 @@ TEST_F(SameSiteDataRemoverImplTest, TestRemoveOnlySameSiteNoneCookies) {
 
 TEST_F(SameSiteDataRemoverImplTest, TestRemoveSameDomainCookies) {
   BrowserContext* browser_context = GetBrowserContext();
-  CreateCookieForTest(
-      "TestCookie1", "www.google.com", net::CookieSameSite::NO_RESTRICTION,
-      net::CookieOptions::SameSiteCookieContext::CROSS_SITE, browser_context);
+  CreateCookieForTest("TestCookie1", "www.google.com",
+                      net::CookieSameSite::NO_RESTRICTION,
+                      net::CookieOptions::SameSiteCookieContext::CROSS_SITE,
+                      true /* is_cookie_secure */, browser_context);
   // The second cookie has the same domain as the first cookie, but also has
   // SameSite value STRICT_MODE instead of NO_RESTRICTION.
   CreateCookieForTest(
       "TestCookie2", "www.google.com", net::CookieSameSite::STRICT_MODE,
       net::CookieOptions::SameSiteCookieContext::SAME_SITE_STRICT,
-      browser_context);
+      false /* is_cookie_secure */, browser_context);
 
   DeleteSameSiteNoneCookies();
 
@@ -175,11 +178,11 @@ TEST_F(SameSiteDataRemoverImplTest, TestKeepSameSiteCookies) {
   CreateCookieForTest("TestCookie1", "www.google.com",
                       net::CookieSameSite::LAX_MODE,
                       net::CookieOptions::SameSiteCookieContext::SAME_SITE_LAX,
-                      browser_context);
+                      false /* is_cookie_secure */, browser_context);
   CreateCookieForTest(
       "TestCookie2", "www.gmail.google.com", net::CookieSameSite::STRICT_MODE,
       net::CookieOptions::SameSiteCookieContext::SAME_SITE_STRICT,
-      browser_context);
+      false /* is_cookie_secure */, browser_context);
 
   DeleteSameSiteNoneCookies();
 
@@ -202,7 +205,7 @@ TEST_F(SameSiteDataRemoverImplTest, TestCookieRemovalUnaffectedByParameters) {
   bool result_out = false;
   cookie_manager->SetCanonicalCookie(
       net::CanonicalCookie("TestCookie1", "20", "google.com", "/",
-                           base::Time::Now(), base::Time(), base::Time(), false,
+                           base::Time::Now(), base::Time(), base::Time(), true,
                            true, net::CookieSameSite::NO_RESTRICTION,
                            net::COOKIE_PRIORITY_HIGH),
       "https", options,
@@ -252,9 +255,10 @@ TEST_F(SameSiteDataRemoverImplTest, TestStoragePartitionDataRemoval) {
   GetSameSiteDataRemoverImpl()->OverrideStoragePartitionForTesting(
       &storage_partition);
 
-  CreateCookieForTest(
-      "TestCookie1", ".google.com", net::CookieSameSite::NO_RESTRICTION,
-      net::CookieOptions::SameSiteCookieContext::CROSS_SITE, browser_context);
+  CreateCookieForTest("TestCookie1", ".google.com",
+                      net::CookieSameSite::NO_RESTRICTION,
+                      net::CookieOptions::SameSiteCookieContext::CROSS_SITE,
+                      true /* is_cookie_secure */, browser_context);
   DeleteSameSiteNoneCookies();
 
   ClearStoragePartitionData();