From 46e822d7246859ac18213515461a561e97b03a51 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Mon, 21 Mar 2022 17:19:29 -0700
Subject: [PATCH 1/2] [ci] Update Chrome install script and version.

This brings the version of Chrome that we use for integration web tests
in line with the one used by flutter/flutter and flutter/engine.
---
 script/install_chromium.sh | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/script/install_chromium.sh b/script/install_chromium.sh
index 1cb38af05496..adcbd819b61f 100755
--- a/script/install_chromium.sh
+++ b/script/install_chromium.sh
@@ -10,24 +10,35 @@ readonly TARGET_DIR=$1
 # The build of Chromium used to test web functionality.
 #
 # Chromium builds can be located here: https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/
-readonly CHROMIUM_BUILD=768968
-# The ChromeDriver version corresponding to the build above. See
-# https://chromedriver.chromium.org/downloads
-# for versions mappings when updating Chromium.
-readonly CHROME_DRIVER_VERSION=84.0.4147.30
+#
+# Check: https://github.com/flutter/engine/blob/master/lib/web_ui/dev/browser_lock.yaml
+readonly CHROMIUM_BUILD=929514
+
+# The correct ChromeDriver is distributed alongside the chromium build above, as
+# `chromedriver_linux64.zip`, so no need to hardcode any extra info about it.
+readonly DOWNLOAD_ROOT="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${CHROMIUM_BUILD}%2F"
 
 # Install Chromium.
-mkdir "$TARGET_DIR"
-wget --no-verbose "https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${CHROMIUM_BUILD}%2Fchrome-linux.zip?alt=media" -O "$TARGET_DIR"/chromium.zip
-unzip "$TARGET_DIR"/chromium.zip -d "$TARGET_DIR"/
+mkdir $TARGET_DIR
+readonly CHROMIUM_ZIP_FILE="$TARGET_DIR/chromium.zip"
+wget --no-verbose "${DOWNLOAD_ROOT}chrome-linux.zip?alt=media" -O $CHROMIUM_ZIP_FILE
+unzip -q $CHROMIUM_ZIP_FILE -d "$TARGET_DIR/"
 
 # Install ChromeDriver.
 readonly DRIVER_ZIP_FILE="$TARGET_DIR/chromedriver.zip"
-wget --no-verbose "https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip" -O "$DRIVER_ZIP_FILE"
-unzip "$DRIVER_ZIP_FILE" -d "$TARGET_DIR/chromedriver"
+wget --no-verbose "${DOWNLOAD_ROOT}chromedriver_linux64.zip?alt=media" -O $DRIVER_ZIP_FILE
+unzip -q $DRIVER_ZIP_FILE -d "$TARGET_DIR/"
+# Rename TARGET_DIR/chromedriver_linux64 to the expected TARGET_DIR/chromedriver
+mv -T "$TARGET_DIR/chromedriver_linux64" "$TARGET_DIR/chromedriver"
+
+export CHROME_EXECUTABLE="$TARGET_DIR/chrome-linux/chrome"
 
 # Echo info at the end for ease of debugging.
-export CHROME_EXECUTABLE="$TARGET_DIR"/chrome-linux/chrome
+set +x
+echo
+readonly CHROMEDRIVER_EXECUTABLE="$TARGET_DIR/chromedriver/chromedriver"
 echo $CHROME_EXECUTABLE
 $CHROME_EXECUTABLE --version
-echo "ChromeDriver $CHROME_DRIVER_VERSION"
+echo $CHROMEDRIVER_EXECUTABLE
+$CHROMEDRIVER_EXECUTABLE --version
+echo

From 2bcc3790ac8571ae3ed729c704f7cb0472cf3542 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Wed, 23 Mar 2022 10:06:37 -0700
Subject: [PATCH 2/2] Quote bash variables.

---
 script/install_chromium.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/script/install_chromium.sh b/script/install_chromium.sh
index adcbd819b61f..b7d787626d55 100755
--- a/script/install_chromium.sh
+++ b/script/install_chromium.sh
@@ -19,15 +19,15 @@ readonly CHROMIUM_BUILD=929514
 readonly DOWNLOAD_ROOT="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${CHROMIUM_BUILD}%2F"
 
 # Install Chromium.
-mkdir $TARGET_DIR
+mkdir "$TARGET_DIR"
 readonly CHROMIUM_ZIP_FILE="$TARGET_DIR/chromium.zip"
-wget --no-verbose "${DOWNLOAD_ROOT}chrome-linux.zip?alt=media" -O $CHROMIUM_ZIP_FILE
-unzip -q $CHROMIUM_ZIP_FILE -d "$TARGET_DIR/"
+wget --no-verbose "${DOWNLOAD_ROOT}chrome-linux.zip?alt=media" -O "$CHROMIUM_ZIP_FILE"
+unzip -q "$CHROMIUM_ZIP_FILE" -d "$TARGET_DIR/"
 
 # Install ChromeDriver.
 readonly DRIVER_ZIP_FILE="$TARGET_DIR/chromedriver.zip"
-wget --no-verbose "${DOWNLOAD_ROOT}chromedriver_linux64.zip?alt=media" -O $DRIVER_ZIP_FILE
-unzip -q $DRIVER_ZIP_FILE -d "$TARGET_DIR/"
+wget --no-verbose "${DOWNLOAD_ROOT}chromedriver_linux64.zip?alt=media" -O "$DRIVER_ZIP_FILE"
+unzip -q "$DRIVER_ZIP_FILE" -d "$TARGET_DIR/"
 # Rename TARGET_DIR/chromedriver_linux64 to the expected TARGET_DIR/chromedriver
 mv -T "$TARGET_DIR/chromedriver_linux64" "$TARGET_DIR/chromedriver"
 
@@ -37,8 +37,8 @@ export CHROME_EXECUTABLE="$TARGET_DIR/chrome-linux/chrome"
 set +x
 echo
 readonly CHROMEDRIVER_EXECUTABLE="$TARGET_DIR/chromedriver/chromedriver"
-echo $CHROME_EXECUTABLE
-$CHROME_EXECUTABLE --version
-echo $CHROMEDRIVER_EXECUTABLE
-$CHROMEDRIVER_EXECUTABLE --version
+echo "$CHROME_EXECUTABLE"
+"$CHROME_EXECUTABLE" --version
+echo "$CHROMEDRIVER_EXECUTABLE"
+"$CHROMEDRIVER_EXECUTABLE" --version
 echo