Explicitly enable SubresourceWebBundles for web tests

This CL (temporarily) explicitly enables SubresourceWebBundles for web
tests. Two tests under webexposed/ are rebaselined.
virtual/subresource-web-bundles is removed.

This is to seperate the change of web test expectations from
crrev.com/c/2375886 which will enable the feature for web tests by
adjusting the application order of blink feature status and chromium
feature status.

Bug: 1121839
Change-Id: I21da03bc90e456fbf606056f03351dd5f72e2161
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2378711Reviewed-by: Kunihiko Sakamoto <ksakamoto@chromium.org>
Reviewed-by: Hayato Ito <hayato@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802109}

content/child/runtime_features.cc

@@ -556,7 +556,8 @@ void SetRuntimeFeaturesFromFieldTrialParams() {
 // as a last resort.
 void SetCustomizedRuntimeFeaturesFromCombinedArgs(
     const base::CommandLine& command_line,
-    bool enable_experimental_web_platform_features) {
+    bool enable_experimental_web_platform_features,
+    bool enable_blink_test_features) {
   // CAUTION: Only add custom enabling logic here if it cannot
   // be covered by the other functions.
 
@@ -605,6 +606,10 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
     WebRuntimeFeatures::EnableNetInfoDownlinkMax(true);
   }
 
+  if (enable_blink_test_features) {
+    WebRuntimeFeatures::EnableSubresourceWebBundles(true);
+  }
+
   // Except for stable release mode, web tests still run with Web Components
   // v0 features enabled.
   // TODO(crbug.com/937746): remove this once the features are deleted.
@@ -672,8 +677,10 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
   // Sets experimental features.
   bool enable_experimental_web_platform_features =
       command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures);
+  bool enable_blink_test_features =
+      command_line.HasSwitch(switches::kEnableBlinkTestFeatures);
 
-  if (command_line.HasSwitch(switches::kEnableBlinkTestFeatures)) {
+  if (enable_blink_test_features) {
     enable_experimental_web_platform_features = true;
     WebRuntimeFeatures::EnableTestOnlyFeatures(true);
   }
@@ -705,7 +712,8 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
   SetRuntimeFeaturesFromFieldTrialParams();
 
   SetCustomizedRuntimeFeaturesFromCombinedArgs(
-      command_line, enable_experimental_web_platform_features);
+      command_line, enable_experimental_web_platform_features,
+      enable_blink_test_features);
 
   // Enable explicitly enabled features, and then disable explicitly disabled
   // ones.

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -1794,7 +1794,7 @@
       name: "SubresourceWebBundles",
       origin_trial_feature_name: "SubresourceWebBundles",
       origin_trial_allows_third_party: true,
-      status: "experimental"
+      status: "test"
     },
     {
       name: "SurfaceEmbeddingFeatures",

third_party/blink/web_tests/NeverFixTests

@@ -2145,10 +2145,6 @@ virtual/passive-fingerprinting/http/tests/navigation/frozen-useragent.html [ Pas
 # This test run under virtual suites only.
 crbug.com/1018640 external/wpt/web-bundle/wbn-from-network/* [ Skip ]
 virtual/wbn-from-network/external/wpt/web-bundle/wbn-from-network/* [ Pass ]
-crbug.com/1082020 external/wpt/web-bundle/subresource-loading/* [ Skip ]
-virtual/subresource-web-bundles/external/wpt/web-bundle/subresource-loading/* [ Pass ]
-crbug.com/1082020 http/tests/loading/wbn/subresource-loading/* [ Skip ]
-virtual/subresource-web-bundles/http/tests/loading/wbn/subresource-loading/* [ Pass ]
 crbug.com/1082020 http/tests/loading/wbn/origin-trial/* [ Skip ]
 virtual/subresource-web-bundles-disabled/http/tests/loading/wbn/origin-trial/* [ Pass ]
 

third_party/blink/web_tests/VirtualTestSuites

@@ -723,12 +723,6 @@
     "bases": [ "external/wpt/content-security-policy/embedded-enforcement" ],
     "args": [ "--enable-features=OutOfBlinkCSPEE" ]
   },
-  {
-    "prefix": "subresource-web-bundles",
-    "bases": [ "external/wpt/web-bundle/subresource-loading",
-               "http/tests/loading/wbn/subresource-loading" ],
-    "args": [ "--enable-blink-features=SubresourceWebBundles" ]
-  },
   {
     "prefix": "subresource-web-bundles-disabled",
     "bases": [ "http/tests/loading/wbn/origin-trial/" ],

third_party/blink/web_tests/virtual/subresource-web-bundles/README.md

-This directory is for testing the SubresourceWebBundles feature.

third_party/blink/web_tests/virtual/subresource-web-bundles/external/wpt/web-bundle/subresource-loading/README.txt

-This directory is for testing the SubresourceWebBundles feature.

third_party/blink/web_tests/webexposed/element-instance-property-listing-expected.txt

@@ -790,6 +790,7 @@ html element link
     property referrerPolicy
     property rel
     property relList
+    property resources
     property rev
     property sheet
     property sizes

third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt

@@ -3623,6 +3623,7 @@ interface HTMLLinkElement : HTMLElement
     getter referrerPolicy
     getter rel
     getter relList
+    getter resources
     getter rev
     getter sheet
     getter sizes
@@ -3643,6 +3644,7 @@ interface HTMLLinkElement : HTMLElement
     setter referrerPolicy
     setter rel
     setter relList
+    setter resources
     setter rev
     setter sizes
     setter target