From 8a13f910ce6c77f37ef993a4e39f366fd5babb8b Mon Sep 17 00:00:00 2001
From: Panagiotis Astithas <pastith@gmail.com>
Date: Sat, 28 Oct 2023 00:48:59 +0000
Subject: [PATCH] Remove the unfinished chrome_ios product (#3569)

* Remove unused variable that causes hterm error

* Revert "Add chrome_ios as a browser name (#3087)"

This reverts commit 0b31816094e9fdf9c447da8d5d3b6ae745648957 since the
work to upload Chrome iOS runs isn't going to happen any time soon.
---
 shared/browsers.go                | 2 +-
 shared/browsers_test.go           | 3 +--
 shared/product_spec.go            | 2 --
 util/commands.sh                  | 1 -
 webapp/components/product-info.js | 3 +--
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/shared/browsers.go b/shared/browsers.go
index 0cc8d0e12fd..cfd911432b2 100644
--- a/shared/browsers.go
+++ b/shared/browsers.go
@@ -14,7 +14,7 @@ var defaultBrowsers = []string{
 
 // An extra list of known browsers.
 var extraBrowsers = []string{
-	"android_webview", "chrome_android", "chrome_ios", "chromium", "deno", "epiphany", "firefox_android", "flow", "node.js", "servo", "uc", "wktr", "webkitgtk",
+	"android_webview", "chrome_android", "chromium", "deno", "epiphany", "firefox_android", "flow", "node.js", "servo", "uc", "wktr", "webkitgtk",
 }
 
 var allBrowsers mapset.Set
diff --git a/shared/browsers_test.go b/shared/browsers_test.go
index f4b8e6bda42..6f339957dcc 100644
--- a/shared/browsers_test.go
+++ b/shared/browsers_test.go
@@ -1,3 +1,4 @@
+//go:build small
 // +build small
 
 // Copyright 2017 The WPT Dashboard Project. All rights reserved.
@@ -20,7 +21,6 @@ func TestGetDefaultBrowserNames(t *testing.T) {
 	for _, n := range names {
 		assert.NotEqual(t, "android_webview", n)
 		assert.NotEqual(t, "chrome_android", n)
-		assert.NotEqual(t, "chrome_ios", n)
 		assert.NotEqual(t, "chromium", n)
 		assert.NotEqual(t, "deno", n)
 		assert.NotEqual(t, "epiphany", n)
@@ -45,7 +45,6 @@ func TestIsBrowserName(t *testing.T) {
 	assert.True(t, IsBrowserName("node.js"))
 	assert.True(t, IsBrowserName("safari"))
 	assert.True(t, IsBrowserName("chrome_android"))
-	assert.True(t, IsBrowserName("chrome_ios"))
 	assert.True(t, IsBrowserName("android_webview"))
 	assert.True(t, IsBrowserName("epiphany"))
 	assert.True(t, IsBrowserName("servo"))
diff --git a/shared/product_spec.go b/shared/product_spec.go
index 530f3849fc5..221b4e32a74 100644
--- a/shared/product_spec.go
+++ b/shared/product_spec.go
@@ -76,8 +76,6 @@ func (p ProductSpec) DisplayName() string {
 		return "Chromium"
 	case "chrome_android":
 		return "ChromeAndroid"
-	case "chrome_ios":
-		return "ChromeIOS"
 	case "android_webview":
 		return "WebView"
 	case "deno":
diff --git a/util/commands.sh b/util/commands.sh
index b3343dacd14..63f89e8f737 100755
--- a/util/commands.sh
+++ b/util/commands.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-DOCKER_DIR=$(dirname $0)
 DOCKER_IMAGE=${DOCKER_IMAGE:-"webplatformtests/wpt.fyi:latest"}
 DOCKER_INSTANCE=${DOCKER_INSTANCE:-"wptd-dev-instance"}
 WPTD_HOST_WEB_PORT=${WPTD_HOST_WEB_PORT:-"8080"}
diff --git a/webapp/components/product-info.js b/webapp/components/product-info.js
index 8869b3e2ab6..cb1ac4b3bab 100644
--- a/webapp/components/product-info.js
+++ b/webapp/components/product-info.js
@@ -11,7 +11,6 @@ const DisplayNames = (() => {
   ['safari', 'safari-experimental'].forEach(n => m.set(n, 'Safari'));
   m.set('android_webview', 'WebView');
   m.set('chrome_android', 'ChromeAndroid');
-  m.set('chrome_ios', 'ChromeIOS');
   m.set('chromium', 'Chromium');
   m.set('deno', 'Deno');
   m.set('firefox_android', 'Firefox Android');
@@ -47,7 +46,7 @@ const versionPatterns = Object.freeze({
 });
 
 // The set of all browsers known to the wpt.fyi UI.
-const AllBrowserNames = Object.freeze(['android_webview', 'chrome_android', 'chrome_ios', 'chrome',
+const AllBrowserNames = Object.freeze(['android_webview', 'chrome_android', 'chrome',
   'chromium', 'deno', 'edge', 'firefox_android', 'firefox', 'flow', 'node.js', 'safari', 'servo', 'webkitgtk', 'wktr']);
 
 // The list of default browsers used in cases where the user has not otherwise