Remove unused content setting from user bypass impl (3/3)

This CL removes unused/abandoned code for a content setting that was
introduced during the initial implementation work for UserBypass.

This is CL 3 out of 3.

Bug: 1386190
Change-Id: I2f8fd0c21de9527c92f5ada2a1b738ae45f45495
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4752763
Commit-Queue: Joshua Hood <jdh@chromium.org>
Reviewed-by: Chris Fredrickson <cfredric@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1181650}

net/cookies/cookie_setting_override.h

@@ -15,19 +15,16 @@ namespace net {
 enum class CookieSettingOverride {
   kMinValue = 0,
 
-  // When specified, the user has indicated to force allowing third-party
-  // cookies.
-  kForceThirdPartyByUser = kMinValue,
   // When specified, third-party cookies may be allowed based on existence of
   // TopLevelStorageAccess grants.
-  kTopLevelStorageAccessGrantEligible = 1,
+  kTopLevelStorageAccessGrantEligible = kMinValue,
   // When present, the caller may use an existing Storage Access API grant (if
   // a matching grant exists) to access third-party cookies. Otherwise, Storage
   // Access API grants do not apply.
-  kStorageAccessGrantEligible = 2,
+  kStorageAccessGrantEligible = 1,
   // When present, 3PCD support settings (ContentSettingsType::TPCD_SUPPORT)
   // will be respected.
-  k3pcdSupport = 3,
+  k3pcdSupport = 2,
   kMaxValue = k3pcdSupport,
 };
 

net/cookies/cookie_util.h

@@ -43,7 +43,7 @@ enum class StorageAccessResult {
   ACCESS_BLOCKED = 0,
   ACCESS_ALLOWED = 1,
   ACCESS_ALLOWED_STORAGE_ACCESS_GRANT = 2,
-  ACCESS_ALLOWED_FORCED = 3,
+  OBSOLETE_ACCESS_ALLOWED_FORCED = 3 /*(DEPRECATED)*/,
   ACCESS_ALLOWED_TOP_LEVEL_STORAGE_ACCESS_GRANT = 4,
   ACCESS_ALLOWED_3PCD = 5,
   kMaxValue = ACCESS_ALLOWED_3PCD,

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -3532,12 +3532,6 @@
       status: {"Android": "stable"},
       base_feature: "none",
     },
-    {
-      name: "ThirdPartyCookiesUserBypass",
-      status: "experimental",
-      base_feature: "none",
-      browser_process_read_write_access: true,
-    },
     {
       // Support for the timeline-scope property.
       //

tools/metrics/histograms/enums.xml

@@ -101785,7 +101785,8 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="1" label="Storage access allowed"/>
   <int value="2" label="Access grant used to allow access"/>
   <int value="3"
-      label="Storage access allowed by force-allowed third-party-cookies"/>
+      label="Storage access allowed by force-allowed third-party-cookies
+             (deprecated)"/>
   <int value="4"
       label="Storage access allowed by the top-level version of the API"/>
   <int value="5" label="Storage access allowed by 3PCD setting"/>