From 9bcebce2208f44e7357951d671693521921bddeb Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 21 Jun 2021 06:30:27 +0000
Subject: [PATCH] [infra] Upgrade Chrome to 91

* Sort command line options passed to chrome.
* Add --disable-component-updates to reduce flakiness from self-updates.
* Add --use-mock-keychain to avoid modal permissions dialog on macOS.

Change-Id: I63bf4895c219efe691af683dab527a036a8e018b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/203520
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 DEPS                                            | 5 ++---
 pkg/test_runner/lib/src/browser_controller.dart | 8 +++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/DEPS b/DEPS
index 177e023d6f3..12313d75082 100644
--- a/DEPS
+++ b/DEPS
@@ -105,7 +105,6 @@ vars = {
   # For more details, see https://github.com/dart-lang/sdk/issues/30164
   "dart_style_rev": "f17c23e0eea9a870601c19d904e2a9c1a7c81470",
 
-  "chromedriver_tag": "83.0.4103.39",
   "dartdoc_rev" : "b733d4952dbd25374d55e28476a5f44bd60ed63f",
   "devtools_rev" : "b3bf672474a2bff82f33e1176aa803539baa0d60+1",
   "jsshell_tag": "version:88.0",
@@ -185,7 +184,7 @@ vars = {
   # Pinned browser versions used by the testing infrastructure. These are not
   # meant to be downloaded by users for local testing.
   "download_chrome": False,
-  "chrome_tag": "84",
+  "chrome_tag": "91",
   "download_firefox": False,
   "firefox_tag": "67",
 }
@@ -523,7 +522,7 @@ deps = {
     "packages": [
       {
         "package": "dart/third_party/chromedriver/${{platform}}",
-        "version": "version:" + Var("chromedriver_tag"),
+        "version": "version:" + Var("chrome_tag"),
       }
     ],
     "condition": "host_cpu == 'x64'",
diff --git a/pkg/test_runner/lib/src/browser_controller.dart b/pkg/test_runner/lib/src/browser_controller.dart
index fce0fcac9cb..02289f4b78d 100644
--- a/pkg/test_runner/lib/src/browser_controller.dart
+++ b/pkg/test_runner/lib/src/browser_controller.dart
@@ -462,12 +462,14 @@ class Chrome extends Browser {
           }
         };
         var args = [
-          "--user-data-dir=${userDir.path}",
-          url,
+          "--bwsi",
+          "--disable-component-update",
           "--disable-extensions",
           "--disable-popup-blocking",
-          "--bwsi",
           "--no-first-run",
+          "--use-mock-keychain",
+          "--user-data-dir=${userDir.path}",
+          url,
         ];
 
         // TODO(rnystrom): Uncomment this to open the dev tools tab when Chrome