1 files changed, 22 insertions, 50 deletions
diff --git a/chromium/net/cookies/cookie_deletion_info_unittest.cc b/chromium/net/cookies/cookie_deletion_info_unittest.cc
index 75686868906..d408ceeec83 100644
--- a/chromium/net/cookies/cookie_deletion_info_unittest.cc
+++ b/chromium/net/cookies/cookie_deletion_info_unittest.cc
@@ -507,56 +507,28 @@ TEST(CookieDeletionInfoTest, CookieDeletionInfoMatchesDomainList) {
 // the IncludeForRequestURL call uses CookieOptions::MakeAllInclusive).
 TEST(CookieDeletionInfoTest, MatchesWithCookieAccessSemantics) {
   // Cookie with unspecified SameSite.
-  auto cookie =
-      CanonicalCookie::Create(GURL("https://www.example.com"), "cookie=1",
-                              base::Time::Now(), absl::nullopt);
-
-  {
-    // With SameSite features off.
-    base::test::ScopedFeatureList feature_list;
-    feature_list.InitAndDisableFeature(features::kSameSiteByDefaultCookies);
-
-    CookieDeletionInfo delete_info;
-    delete_info.url = GURL("https://www.example.com/path");
-    EXPECT_TRUE(delete_info.Matches(
-        *cookie,
-        CookieAccessParams{CookieAccessSemantics::UNKNOWN,
-                           /*delegate_treats_url_as_trustworthy=*/false,
-                           CookieSamePartyStatus::kNoSamePartyEnforcement}));
-    EXPECT_TRUE(delete_info.Matches(
-        *cookie,
-        CookieAccessParams{CookieAccessSemantics::LEGACY,
-                           /*delegate_treats_url_as_trustworthy=*/false,
-                           CookieSamePartyStatus::kNoSamePartyEnforcement}));
-    EXPECT_TRUE(delete_info.Matches(
-        *cookie,
-        CookieAccessParams{CookieAccessSemantics::NONLEGACY,
-                           /*delegate_treats_url_as_trustworthy=*/false,
-                           CookieSamePartyStatus::kNoSamePartyEnforcement}));
-  }
-  {
-    // With SameSite features on.
-    base::test::ScopedFeatureList feature_list;
-    feature_list.InitAndEnableFeature(features::kSameSiteByDefaultCookies);
-
-    CookieDeletionInfo delete_info;
-    delete_info.url = GURL("https://www.example.com/path");
-    EXPECT_TRUE(delete_info.Matches(
-        *cookie,
-        CookieAccessParams{CookieAccessSemantics::UNKNOWN,
-                           /*delegate_treats_url_as_trustworthy=*/false,
-                           CookieSamePartyStatus::kNoSamePartyEnforcement}));
-    EXPECT_TRUE(delete_info.Matches(
-        *cookie,
-        CookieAccessParams{CookieAccessSemantics::LEGACY,
-                           /*delegate_treats_url_as_trustworthy=*/false,
-                           CookieSamePartyStatus::kNoSamePartyEnforcement}));
-    EXPECT_TRUE(delete_info.Matches(
-        *cookie,
-        CookieAccessParams{CookieAccessSemantics::NONLEGACY,
-                           /*delegate_treats_url_as_trustworthy=*/false,
-                           CookieSamePartyStatus::kNoSamePartyEnforcement}));
-  }
+  auto cookie = CanonicalCookie::Create(
+      GURL("https://www.example.com"), "cookie=1", base::Time::Now(),
+      absl::nullopt /* server_time */,
+      absl::nullopt /* cookie_partition_key */);
+
+  CookieDeletionInfo delete_info;
+  delete_info.url = GURL("https://www.example.com/path");
+  EXPECT_TRUE(delete_info.Matches(
+      *cookie,
+      CookieAccessParams{CookieAccessSemantics::UNKNOWN,
+                         /*delegate_treats_url_as_trustworthy=*/false,
+                         CookieSamePartyStatus::kNoSamePartyEnforcement}));
+  EXPECT_TRUE(delete_info.Matches(
+      *cookie,
+      CookieAccessParams{CookieAccessSemantics::LEGACY,
+                         /*delegate_treats_url_as_trustworthy=*/false,
+                         CookieSamePartyStatus::kNoSamePartyEnforcement}));
+  EXPECT_TRUE(delete_info.Matches(
+      *cookie,
+      CookieAccessParams{CookieAccessSemantics::NONLEGACY,
+                         /*delegate_treats_url_as_trustworthy=*/false,
+                         CookieSamePartyStatus::kNoSamePartyEnforcement}));
 }
 
 }  // namespace net