Enable AlignFontDisplayAutoTimeoutWithLCPGoal by default on trunk

This patch enables the feature by default following the discussion in:

https://docs.google.com/document/d/1L-Aphp1oGwJyPw8k_NEKPPR2siSUc2pBq9bJf7lXFXk/edit

The enabled default parameters are:
- intervention-mode: swap
- lcp-limit-in-ms: 2000

Bug: 1065508
Change-Id: Iac8a1932ad9a4c468011ddf98ad723fe30f96d65
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2430045Reviewed-by: Jesse Doherty <jwd@chromium.org>
Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810886}

testing/variations/fieldtrial_testing_config.json

@@ -41,31 +41,6 @@
             ]
         }
     ],
-    "AlignFontDisplayAutoTimeoutWithLCPGoal": [
-        {
-            "platforms": [
-                "android",
-                "android_weblayer",
-                "android_webview",
-                "chromeos",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "EnabledWithSwapModeAndTimeout1000ms",
-                    "params": {
-                        "intervention-mode": "swap",
-                        "lcp-limit-in-ms": "1000"
-                    },
-                    "enable_features": [
-                        "AlignFontDisplayAutoTimeoutWithLCPGoal"
-                    ]
-                }
-            ]
-        }
-    ],
     "AllPassiveMixedContentAutoupgrade": [
         {
             "platforms": [

third_party/blink/common/features.cc

@@ -631,8 +631,7 @@ const base::Feature kAVIF{"AVIF", base::FEATURE_ENABLED_BY_DEFAULT};
 // immediately before reaching the LCP time limit (~2500ms), so that web fonts
 // do not become a source of bad LCP.
 const base::Feature kAlignFontDisplayAutoTimeoutWithLCPGoal{
-    "AlignFontDisplayAutoTimeoutWithLCPGoal",
-    base::FEATURE_DISABLED_BY_DEFAULT};
+    "AlignFontDisplayAutoTimeoutWithLCPGoal", base::FEATURE_ENABLED_BY_DEFAULT};
 
 // The amount of time allowed for 'display: auto' web fonts to load without
 // intervention, counted from navigation start.
@@ -648,7 +647,7 @@ const base::FeatureParam<AlignFontDisplayAutoTimeoutWithLCPGoalMode>::Option
 const base::FeatureParam<AlignFontDisplayAutoTimeoutWithLCPGoalMode>
     kAlignFontDisplayAutoTimeoutWithLCPGoalModeParam{
         &kAlignFontDisplayAutoTimeoutWithLCPGoal, "intervention-mode",
-        AlignFontDisplayAutoTimeoutWithLCPGoalMode::kToFailurePeriod,
+        AlignFontDisplayAutoTimeoutWithLCPGoalMode::kToSwapPeriod,
         &align_font_display_auto_timeout_with_lcp_goal_modes};
 
 // Enable throttling of fetch() requests from service workers in the

third_party/blink/web_tests/TestExpectations

@@ -1988,6 +1988,9 @@ crbug.com/796619 [ Win10 ] external/wpt/css/css-fonts/matching/style-ranges-over
 crbug.com/450619 external/wpt/css/css-fonts/font-feature-resolution-001.html [ Failure ]
 crbug.com/450619 external/wpt/css/css-fonts/font-feature-resolution-002.html [ Failure ]
 
+# The WPT asserts browser-specific behavior. Need to modify the test.
+crbug.com/1132458 external/wpt/css/css-fonts/font-display/font-display.html [ Failure ]
+
 # These need a rebaseline due crbug.com/504745 on Windows when they are activated again.
 crbug.com/521124 crbug.com/410145 [ Win7 ] fast/css/font-weight-1.html [ Pass Failure ]
 

third_party/blink/web_tests/http/tests/webfont/slow-loading-expected.html

@@ -15,7 +15,6 @@
 }
 #span3 {
   font-family: Arial;
-  color: white;
 }
 </style>
 </head>
@@ -35,7 +34,7 @@ abcdefg
 </span>
 <br/>
 
-Blank after 4 seconds:
+Arial after hidden for 3 seconds and revealed for 1 second:
 <br/>
 <span class="testspan" id="span3">
 abcdefg

third_party/blink/web_tests/http/tests/webfont/slow-loading.html

@@ -44,7 +44,7 @@ abcdefg
 </span>
 <br/>
 
-Blank after 4 seconds:
+Arial after hidden for 3 seconds and revealed for 1 second:
 <br/>
 <span class="testspan" id="span3" style="display: none;">
 abcdefg