From 3a0f20e893019f82f8dff10f860bd3222f064d90 Mon Sep 17 00:00:00 2001
From: Stephen McGruer <smcgruer@chromium.org>
Date: Thu, 4 Mar 2021 12:07:48 -0500
Subject: [PATCH] Remove obsolete 'experimentalAlignedExceptEdge' admin flag

This flag was used to fetch edge runs back when they were not tagged
with the experimental label. It is no longer useful, and is also
misleading (the name implies it might remove Edge from the default
query, which it does not do). As such, remove it.

This also makes util/populate_dev_data.go closer to what is shipped on
wpt.fyi
---
 shared/test_run_filter.go      | 17 -----------------
 util/populate_dev_data.go      |  2 +-
 webapp/components/wpt-flags.js |  6 ------
 webapp/test_results_handler.go | 12 ++++--------
 4 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/shared/test_run_filter.go b/shared/test_run_filter.go
index 56e7fb348b..85b0654bb1 100644
--- a/shared/test_run_filter.go
+++ b/shared/test_run_filter.go
@@ -119,23 +119,6 @@ func (filter TestRunFilter) OrExperimentalRuns() TestRunFilter {
 	return filter
 }
 
-// OrAlignedExperimentalRunsExceptEdge returns the current filter, or, if it is a default
-// query, returns a query for the latest experimental runs.
-func (filter TestRunFilter) OrAlignedExperimentalRunsExceptEdge() TestRunFilter {
-	if !filter.IsDefaultQuery() {
-		return filter
-	}
-	aligned := true
-	filter.Aligned = &aligned
-	filter.Products = GetDefaultProducts()
-	for i := range filter.Products {
-		if filter.Products[i].BrowserName != "edge" {
-			filter.Products[i].Labels = mapset.NewSetWith("experimental")
-		}
-	}
-	return filter
-}
-
 // MasterOnly returns the current filter, ensuring it has with the master-only
 // restriction (a label of "master").
 func (filter TestRunFilter) MasterOnly() TestRunFilter {
diff --git a/util/populate_dev_data.go b/util/populate_dev_data.go
index e0fca7ab45..c67f587b9a 100644
--- a/util/populate_dev_data.go
+++ b/util/populate_dev_data.go
@@ -160,7 +160,7 @@ func main() {
 	addFlag(store, "diffFilter", enabledFlag)
 	addFlag(store, "diffFromAPI", enabledFlag)
 	addFlag(store, "experimentalByDefault", enabledFlag)
-	addFlag(store, "experimentalAlignedExceptEdge", enabledFlag)
+	addFlag(store, "experimentalAligned", enabledFlag)
 	addFlag(store, "structuredQueries", enabledFlag)
 	addFlag(store, "diffRenames", enabledFlag)
 	addFlag(store, "paginationTokens", enabledFlag)
diff --git a/webapp/components/wpt-flags.js b/webapp/components/wpt-flags.js
index bf211ef698..88397e5662 100644
--- a/webapp/components/wpt-flags.js
+++ b/webapp/components/wpt-flags.js
@@ -23,7 +23,6 @@ Object.defineProperty(wpt, 'ClientSideFeatures', {
       'displayMetadata',
       'experimentalByDefault',
       'experimentalAligned',
-      'experimentalAlignedExceptEdge',
       'fetchManifestForTestList',
       'githubCommitLinks',
       'githubLogin',
@@ -304,11 +303,6 @@ class WPTEnvironmentFlagsEditor extends FlagsEditorClass(/*environmentFlags*/ tr
         Align the default experimental runs
       </paper-checkbox>
     </paper-item>
-    <paper-item sub-item>
-      <paper-checkbox checked="{{experimentalAlignedExceptEdge}}">
-        All experimental, except edge[stable], and aligned
-      </paper-checkbox>
-    </paper-item>
     <paper-item>
       <paper-checkbox checked="{{paginationTokens}}">
         Return "wpt-next-page" pagination token HTTP header in /api/runs
diff --git a/webapp/test_results_handler.go b/webapp/test_results_handler.go
index 267767c78e..815a4c5745 100644
--- a/webapp/test_results_handler.go
+++ b/webapp/test_results_handler.go
@@ -105,14 +105,10 @@ func populateHomepageData(r *http.Request) (data homepageData, err error) {
 	} else {
 		if pr == nil && testRunFilter.IsDefaultQuery() {
 			if aeAPI.IsFeatureEnabled("experimentalByDefault") {
-				if aeAPI.IsFeatureEnabled("experimentalAlignedExceptEdge") {
-					testRunFilter = testRunFilter.OrAlignedExperimentalRunsExceptEdge()
-				} else {
-					testRunFilter = testRunFilter.OrExperimentalRuns()
-					if aeAPI.IsFeatureEnabled("experimentalAligned") {
-						aligned := true
-						testRunFilter.Aligned = &aligned
-					}
+				testRunFilter = testRunFilter.OrExperimentalRuns()
+				if aeAPI.IsFeatureEnabled("experimentalAligned") || true {
+					aligned := true
+					testRunFilter.Aligned = &aligned
 				}
 			} else {
 				testRunFilter = testRunFilter.OrAlignedStableRuns()