[FetchMetadata] Delete fetch metadata experimental features flags.

Delete both network::features::kFetchMetadata and
network::features::kFetchMetadataDestination flags.

Bug: 1054543
Change-Id: Iab8ecca52fe019c48dc27ced7fc832ca576fe22a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2084553Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Commit-Queue: Yifan Luo <lyf@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746387}

chrome/browser/extensions/background_header_browsertest.cc

@@ -27,12 +27,7 @@ std::unique_ptr<net::ClientCertStore> CreateNullCertStore() {
 class BackgroundHeaderTest : public ExtensionBrowserTest {
  public:
   BackgroundHeaderTest()
-      : https_test_server_(net::EmbeddedTestServer::TYPE_HTTPS) {
-    feature_list_.InitWithFeatures(
-        {network::features::kFetchMetadata,
-         network::features::kFetchMetadataDestination},
-        {});
-  }
+      : https_test_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
 
   BackgroundHeaderTest(const BackgroundHeaderTest& other) = delete;
   BackgroundHeaderTest& operator=(const BackgroundHeaderTest& other) = delete;

chrome/browser/sessions/session_restore_browsertest.cc

@@ -2045,12 +2045,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreWithURLInCommandLineTest,
 class MultiOriginSessionRestoreTest : public SessionRestoreTest {
  public:
   MultiOriginSessionRestoreTest()
-      : https_test_server_(net::EmbeddedTestServer::TYPE_HTTPS) {
-    feature_list_.InitWithFeatures(
-        {network::features::kFetchMetadata,
-         network::features::kFetchMetadataDestination},
-        {});
-  }
+      : https_test_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
 
   void SetUpOnMainThread() override {
     SessionRestoreTest::SetUpOnMainThread();

chrome/browser/ui/views/bookmarks/bookmark_bar_view_browsertest.cc

@@ -50,10 +50,6 @@ class BookmarkBarNavigationTest : public InProcessBrowserTest {
       : https_test_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
 
   void SetUp() override {
-    scoped_feature_list_.InitWithFeatures(
-        {network::features::kFetchMetadata,
-         network::features::kFetchMetadataDestination},
-        {});
     InProcessBrowserTest::SetUp();
   }
 

content/browser/frame_host/sec_fetch_browsertest.cc

@@ -31,12 +31,7 @@ namespace content {
 class SecFetchBrowserTest : public ContentBrowserTest {
  public:
   SecFetchBrowserTest()
-      : https_test_server_(net::EmbeddedTestServer::TYPE_HTTPS) {
-    feature_list_.InitWithFeatures(
-        {network::features::kFetchMetadata,
-         network::features::kFetchMetadataDestination},
-        {});
-  }
+      : https_test_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
 
   void SetUpOnMainThread() override {
     host_resolver()->AddRule("*", "127.0.0.1");

content/browser/loader/browser_initiated_resource_request.cc

@@ -22,19 +22,6 @@
 
 namespace content {
 
-bool IsFetchMetadataEnabled() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kEnableExperimentalWebPlatformFeatures) ||
-         base::FeatureList::IsEnabled(network::features::kFetchMetadata);
-}
-
-bool IsFetchMetadataDestinationEnabled() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kEnableExperimentalWebPlatformFeatures) ||
-         base::FeatureList::IsEnabled(
-             network::features::kFetchMetadataDestination);
-}
-
 void UpdateAdditionalHeadersForBrowserInitiatedRequest(
     net::HttpRequestHeaders* headers,
     BrowserContext* browser_context,

content/browser/loader/browser_initiated_resource_request.h

@@ -19,14 +19,6 @@ namespace content {
 
 class BrowserContext;
 
-// Returns true if either of FetchMetadata or experimental-web-platform-features
-// is enabled.
-bool IsFetchMetadataEnabled();
-
-// Returns true if either of FetchMetadataDestination or
-// experimental-web-platform-features is enabled.
-bool IsFetchMetadataDestinationEnabled();
-
 // Sets request headers appropriate for browser-initiated resource requests,
 // i.e., requests for navigations and dedicated/shared/service worker
 // scripts.

content/child/runtime_features.cc

@@ -181,10 +181,6 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
           {wf::EnableWebXRHitTest, features::kWebXrHitTest, kUseFeatureState},
           {wf::EnableWebXRIncubations, features::kWebXrIncubations,
            kEnableOnly},
-          {wf::EnableFetchMetadata, network::features::kFetchMetadata,
-           kUseFeatureState},
-          {wf::EnableFetchMetadataDestination,
-           network::features::kFetchMetadataDestination, kUseFeatureState},
           {wf::EnableUserActivationPostMessageTransfer,
            features::kUserActivationPostMessageTransfer, kUseFeatureState},
           {wf::EnableUserActivationSameOriginVisibility,
@@ -546,8 +542,6 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
   // these features.
   if (enable_experimental_web_platform_features) {
     WebRuntimeFeatures::EnableNetInfoDownlinkMax(true);
-    WebRuntimeFeatures::EnableFetchMetadata(true);
-    WebRuntimeFeatures::EnableFetchMetadataDestination(true);
   }
 
   WebRuntimeFeatures::EnableBackForwardCache(

services/network/public/cpp/features.cc

@@ -59,16 +59,6 @@ const base::Feature kThrottleDelayable{"ThrottleDelayable",
 const base::Feature kDelayRequestsOnMultiplexedConnections{
     "DelayRequestsOnMultiplexedConnections", base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Implementation of https://mikewest.github.io/sec-metadata/
-const base::Feature kFetchMetadata{"FetchMetadata",
-                                   base::FEATURE_ENABLED_BY_DEFAULT};
-
-// The `Sec-Fetch-Dest` header is split out from the main "FetchMetadata"
-// feature so we can ship the broader feature without this specifific bit
-// while we continue discussion.
-const base::Feature kFetchMetadataDestination{"FetchMetadataDestination",
-                                              base::FEATURE_ENABLED_BY_DEFAULT};
-
 // When kRequestInitiatorSiteLock is enabled, then CORB, CORP and Sec-Fetch-Site
 // will validate network::ResourceRequest::request_initiator against
 // network::mojom::URLLoaderFactoryParams::request_initiator_site_lock.

services/network/public/cpp/features.h

@@ -29,10 +29,6 @@ extern const base::Feature kThrottleDelayable;
 COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kDelayRequestsOnMultiplexedConnections;
 COMPONENT_EXPORT(NETWORK_CPP)
-extern const base::Feature kFetchMetadata;
-COMPONENT_EXPORT(NETWORK_CPP)
-extern const base::Feature kFetchMetadataDestination;
-COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kRequestInitiatorSiteLock;
 COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kPauseBrowserInitiatedHeavyTrafficForP2P;

services/network/sec_header_helpers.cc

@@ -153,8 +153,6 @@ void SetFetchMetadataHeaders(
     const mojom::URLLoaderFactoryParams& factory_params) {
   DCHECK(request);
   DCHECK_NE(0u, request->url_chain().size());
-  if (!base::FeatureList::IsEnabled(features::kFetchMetadata))
-    return;
 
   // Only append the header to potentially trustworthy URLs.
   const GURL& target_url =
@@ -172,9 +170,6 @@ void MaybeRemoveSecHeaders(net::URLRequest* request,
                            const GURL& pending_redirect_url) {
   DCHECK(request);
 
-  if (!base::FeatureList::IsEnabled(features::kFetchMetadata))
-    return;
-
   // If our redirect destination is not trusted it would not have had sec-ch- or
   // sec-fetch- prefixed headers added to it. Our previous hops may have added
   // these headers if the current url is trustworthy though so we should try to

third_party/blink/public/platform/web_runtime_features.h

@@ -165,9 +165,7 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableLazyImageLoadingMetadataFetch(bool);
   BLINK_PLATFORM_EXPORT static void EnableScriptedSpeechRecognition(bool);
   BLINK_PLATFORM_EXPORT static void EnableScriptedSpeechSynthesis(bool);
-  BLINK_PLATFORM_EXPORT static void EnableFetchMetadata(bool);
   BLINK_PLATFORM_EXPORT static void EnableAutoLazyLoadOnReloads(bool);
-  BLINK_PLATFORM_EXPORT static void EnableFetchMetadataDestination(bool);
   BLINK_PLATFORM_EXPORT static void EnableSharedArrayBuffer(bool);
   BLINK_PLATFORM_EXPORT static void EnableSharedWorker(bool);
   BLINK_PLATFORM_EXPORT static void EnableTextFragmentAnchor(bool);

third_party/blink/renderer/platform/exported/web_runtime_features.cc

@@ -505,14 +505,6 @@ void WebRuntimeFeatures::EnableExpensiveBackgroundTimerThrottling(bool enable) {
   RuntimeEnabledFeatures::SetExpensiveBackgroundTimerThrottlingEnabled(enable);
 }
 
-void WebRuntimeFeatures::EnableFetchMetadata(bool enable) {
-  RuntimeEnabledFeatures::SetFetchMetadataEnabled(enable);
-}
-
-void WebRuntimeFeatures::EnableFetchMetadataDestination(bool enable) {
-  RuntimeEnabledFeatures::SetFetchMetadataDestinationEnabled(enable);
-}
-
 void WebRuntimeFeatures::EnableTimerThrottlingForBackgroundTabs(bool enable) {
   RuntimeEnabledFeatures::SetTimerThrottlingForBackgroundTabsEnabled(enable);
 }

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -720,14 +720,6 @@
     {
       name: "FeaturePolicyVibrateFeature"
     },
-    {
-      name: "FetchMetadata",
-      status: "stable"
-    },
-    {
-      name: "FetchMetadataDestination",
-      status: "experimental"
-    },
     {
       // Also enabled when blink::features::kFileHandlingAPI is overridden
       // on the command line (or via chrome://flags).