Remove net::CookieSameSite::EXTENDED_MODE.

Bug: 953995
Change-Id: Id0dd9a4c767ad0c83744c5b10e1735be81ccbd55
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1883293Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Victor Costan <pwnall@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Reviewed-by: Greg Kerr <kerrnel@chromium.org>
Reviewed-by: Lily Chen <chlily@chromium.org>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Caleb Raitto <caraitto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710913}

chrome/browser/extensions/api/cookies/cookies_helpers.cc

@@ -108,7 +108,6 @@ Cookie CreateCookie(const net::CanonicalCookie& canonical_cookie,
       cookie.same_site = api::cookies::SAME_SITE_STATUS_NO_RESTRICTION;
       break;
     case net::CookieSameSite::LAX_MODE:
-    case net::CookieSameSite::EXTENDED_MODE:
       cookie.same_site = api::cookies::SAME_SITE_STATUS_LAX;
       break;
     case net::CookieSameSite::STRICT_MODE:

content/browser/devtools/protocol/network_handler.cc

@@ -136,9 +136,6 @@ std::unique_ptr<Network::Cookie> BuildCookie(
     case net::CookieSameSite::LAX_MODE:
       devtools_cookie->SetSameSite(Network::CookieSameSiteEnum::Lax);
       break;
-    case net::CookieSameSite::EXTENDED_MODE:
-      devtools_cookie->SetSameSite(Network::CookieSameSiteEnum::Extended);
-      break;
     case net::CookieSameSite::NO_RESTRICTION:
       devtools_cookie->SetSameSite(Network::CookieSameSiteEnum::None);
       break;
@@ -294,8 +291,6 @@ std::unique_ptr<net::CanonicalCookie> MakeCookieFromProtocolValues(
     css = net::CookieSameSite::LAX_MODE;
   if (same_site == Network::CookieSameSiteEnum::Strict)
     css = net::CookieSameSite::STRICT_MODE;
-  if (same_site == Network::CookieSameSiteEnum::Extended)
-    css = net::CookieSameSite::EXTENDED_MODE;
   if (same_site == Network::CookieSameSiteEnum::None)
     css = net::CookieSameSite::NO_RESTRICTION;
 

net/cookies/canonical_cookie.cc

@@ -783,9 +783,6 @@ CookieEffectiveSameSite CanonicalCookie::GetEffectiveSameSite(
       return CookieEffectiveSameSite::LAX_MODE;
     case CookieSameSite::STRICT_MODE:
       return CookieEffectiveSameSite::STRICT_MODE;
-    // TODO(crbug.com/989171): Replace this with FirstParty{Lax,Strict}.
-    case CookieSameSite::EXTENDED_MODE:
-      return CookieEffectiveSameSite::LAX_MODE;
   }
 }
 

net/cookies/canonical_cookie_fuzzer.cc

@@ -44,7 +44,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
           CookieSameSite::NO_RESTRICTION,
           CookieSameSite::LAX_MODE,
           CookieSameSite::STRICT_MODE,
-          CookieSameSite::EXTENDED_MODE,
       });
 
   const CookiePriority priority =

net/cookies/canonical_cookie_unittest.cc

@@ -479,24 +479,18 @@ TEST(CanonicalCookieTest, GetEffectiveSameSite) {
        CookieAccessSemantics::UNKNOWN},
       {CookieSameSite::STRICT_MODE, CookieEffectiveSameSite::STRICT_MODE,
        CookieAccessSemantics::UNKNOWN},
-      {CookieSameSite::EXTENDED_MODE, CookieEffectiveSameSite::LAX_MODE,
-       CookieAccessSemantics::UNKNOWN},
       {CookieSameSite::NO_RESTRICTION, CookieEffectiveSameSite::NO_RESTRICTION,
        CookieAccessSemantics::LEGACY},
       {CookieSameSite::LAX_MODE, CookieEffectiveSameSite::LAX_MODE,
        CookieAccessSemantics::LEGACY},
       {CookieSameSite::STRICT_MODE, CookieEffectiveSameSite::STRICT_MODE,
        CookieAccessSemantics::LEGACY},
-      {CookieSameSite::EXTENDED_MODE, CookieEffectiveSameSite::LAX_MODE,
-       CookieAccessSemantics::LEGACY},
       {CookieSameSite::NO_RESTRICTION, CookieEffectiveSameSite::NO_RESTRICTION,
        CookieAccessSemantics::NONLEGACY},
       {CookieSameSite::LAX_MODE, CookieEffectiveSameSite::LAX_MODE,
        CookieAccessSemantics::NONLEGACY},
       {CookieSameSite::STRICT_MODE, CookieEffectiveSameSite::STRICT_MODE,
        CookieAccessSemantics::NONLEGACY},
-      {CookieSameSite::EXTENDED_MODE, CookieEffectiveSameSite::LAX_MODE,
-       CookieAccessSemantics::NONLEGACY},
       // UNSPECIFIED always maps to NO_RESTRICTION if LEGACY access semantics.
       {CookieSameSite::UNSPECIFIED, CookieEffectiveSameSite::NO_RESTRICTION,
        CookieAccessSemantics::LEGACY}};

net/cookies/cookie_constants.cc

@@ -63,8 +63,6 @@ std::string CookieSameSiteToString(CookieSameSite same_site) {
       return kSameSiteStrict;
     case CookieSameSite::NO_RESTRICTION:
       return kSameSiteNone;
-    case CookieSameSite::EXTENDED_MODE:
-      return kSameSiteExtended;
     case CookieSameSite::UNSPECIFIED:
       return kSameSiteUnspecified;
   }

net/cookies/cookie_constants.h

@@ -36,7 +36,7 @@ enum class CookieSameSite {
   NO_RESTRICTION = 0,
   LAX_MODE = 1,
   STRICT_MODE = 2,
-  EXTENDED_MODE = 3,  // TODO(chlily): Remove or gate behind flag.
+  // Reserved 3 (was EXTENDED_MODE), next number is 4.
 };
 
 // These are the enforcement modes that may be applied to a cookie when deciding

net/extras/sqlite/sqlite_persistent_cookie_store.cc

@@ -491,8 +491,6 @@ DBCookieSameSite CookieSameSiteToDBCookieSameSite(CookieSameSite value) {
       return kCookieSameSiteLax;
     case CookieSameSite::STRICT_MODE:
       return kCookieSameSiteStrict;
-    case CookieSameSite::EXTENDED_MODE:
-      return kCookieSameSiteExtended;
     case CookieSameSite::UNSPECIFIED:
       return kCookieSameSiteUnspecified;
   }

services/network/public/cpp/cookie_manager_mojom_traits.cc

@@ -52,8 +52,6 @@ EnumTraits<network::mojom::CookieSameSite, net::CookieSameSite>::ToMojom(
       return network::mojom::CookieSameSite::LAX_MODE;
     case net::CookieSameSite::STRICT_MODE:
       return network::mojom::CookieSameSite::STRICT_MODE;
-    case net::CookieSameSite::EXTENDED_MODE:
-      return network::mojom::CookieSameSite::EXTENDED_MODE;
     default:
       break;
   }
@@ -77,9 +75,6 @@ bool EnumTraits<network::mojom::CookieSameSite, net::CookieSameSite>::FromMojom(
     case network::mojom::CookieSameSite::STRICT_MODE:
       *output = net::CookieSameSite::STRICT_MODE;
       return true;
-    case network::mojom::CookieSameSite::EXTENDED_MODE:
-      *output = net::CookieSameSite::EXTENDED_MODE;
-      return true;
     default:
       break;
   }

services/network/public/cpp/cookie_manager_mojom_traits_unittest.cc

@@ -118,8 +118,7 @@ TEST(CookieManagerTraitsTest, Roundtrips_CookieWithStatus) {
 TEST(CookieManagerTraitsTest, Roundtrips_CookieSameSite) {
   for (net::CookieSameSite cookie_state :
        {net::CookieSameSite::NO_RESTRICTION, net::CookieSameSite::LAX_MODE,
-        net::CookieSameSite::STRICT_MODE, net::CookieSameSite::EXTENDED_MODE,
-        net::CookieSameSite::UNSPECIFIED}) {
+        net::CookieSameSite::STRICT_MODE, net::CookieSameSite::UNSPECIFIED}) {
     net::CookieSameSite roundtrip;
     ASSERT_TRUE(SerializeAndDeserializeEnum<mojom::CookieSameSite>(cookie_state,
                                                                    &roundtrip));

services/network/public/mojom/cookie_manager.mojom

@@ -64,7 +64,7 @@ enum CookieSameSite {
   NO_RESTRICTION = 0,
   LAX_MODE = 1,
   STRICT_MODE = 2,
-  EXTENDED_MODE = 3,
+  // Reserved 3 (was EXTENDED_MODE), next number is 4.
 };
 
 enum CookieSameSiteContext {

third_party/blink/renderer/core/inspector/browser_protocol.pdl

@@ -3860,7 +3860,6 @@ domain Network
     enum
       Strict
       Lax
-      Extended
       None
 
   # Timing information for the request.

third_party/blink/renderer/modules/cookie_store/cookie_change_event.cc

@@ -54,7 +54,6 @@ String ToCookieListItemSameSite(network::mojom::CookieSameSite same_site) {
     case network::mojom::CookieSameSite::STRICT_MODE:
       return "strict";
     case network::mojom::CookieSameSite::LAX_MODE:
-    case network::mojom::CookieSameSite::EXTENDED_MODE:
       return "lax";
     case network::mojom::CookieSameSite::NO_RESTRICTION:
       return "unrestricted";

third_party/blink/renderer/platform/cookie/canonical_cookie.cc

@@ -24,8 +24,6 @@ STATIC_ASSERT_ENUM(net::CookieSameSite::LAX_MODE,
                    network::mojom::CookieSameSite::LAX_MODE);
 STATIC_ASSERT_ENUM(net::CookieSameSite::STRICT_MODE,
                    network::mojom::CookieSameSite::STRICT_MODE);
-STATIC_ASSERT_ENUM(net::CookieSameSite::EXTENDED_MODE,
-                   network::mojom::CookieSameSite::EXTENDED_MODE);
 
 STATIC_ASSERT_ENUM(net::CookiePriority::COOKIE_PRIORITY_LOW,
                    network::mojom::CookiePriority::LOW);