BASELINE: Update Chromium to 90.0.4430.221

Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 24 insertions, 28 deletions

diff --git a/chromium/tools/infra/builder-cache-clobber.py b/chromium/tools/infra/builder-cache-clobber.py
index f74ccb87c75..b50c6909907 100755
--- a/chromium/tools/infra/builder-cache-clobber.py
+++ b/chromium/tools/infra/builder-cache-clobber.py
@@ -21,6 +21,7 @@ def main(raw_args):
   parser.add_argument('--builder', required=True)
   parser.add_argument('--bucket', required=True)
   parser.add_argument('--project', default='chromium')
+  parser.add_argument('--bot-id', default=None)
   args = parser.parse_args(raw_args)
 
   # Matches http://bit.ly/2WZO33P
@@ -28,8 +29,12 @@ def main(raw_args):
   cache = 'builder_%s_v2' % (h.hexdigest())
   pool = 'luci.%s.%s' % (args.project, args.bucket)
 
-  clobber_cache_utils.clobber_caches(args.swarming_server, pool, cache,
-                                     'cache/builder', args.dry_run)
+  clobber_cache_utils.clobber_caches(args.swarming_server,
+                                     pool,
+                                     cache,
+                                     'cache/builder',
+                                     args.dry_run,
+                                     bot_id=args.bot_id)
 
   return 0
 
diff --git a/chromium/tools/infra/clobber_cache_utils.py b/chromium/tools/infra/clobber_cache_utils.py
index ba180373d22..8fef31d59b3 100644
--- a/chromium/tools/infra/clobber_cache_utils.py
+++ b/chromium/tools/infra/clobber_cache_utils.py
@@ -6,56 +6,47 @@
 
 from __future__ import print_function
 
+import json
 import os
 import subprocess
-import sys
 import textwrap
 
 _SRC_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
-_SWARMING_CLIENT = os.path.join(_SRC_ROOT, 'tools', 'swarming_client',
-                                'swarming.py')
+_SWARMING_CLIENT = os.path.join(_SRC_ROOT, 'tools', 'luci-go', 'swarming')
 _SWARMING_SERVER = 'chromium-swarm.appspot.com'
 
 
 def _get_bots(swarming_server, pool, cache):
   cmd = [
-      sys.executable,
       _SWARMING_CLIENT,
       'bots',
-      '-b',
       '-S',
       swarming_server,
-      '-d',
-      'caches',
-      cache,
-      '-d',
-      'pool',
-      pool,
+      '-dimension',
+      'caches=' + cache,
+      '-dimension',
+      'pool=' + pool,
   ]
-  return subprocess.check_output(cmd).splitlines()
+  return [bot['bot_id'] for bot in json.loads(subprocess.check_output(cmd))]
 
 
 def _trigger_clobber(swarming_server, pool, cache, bot, mount_rel_path,
                      dry_run):
   cmd = [
-      sys.executable,
       _SWARMING_CLIENT,
       'trigger',
       '-S',
       swarming_server,
-      '-d',
-      'pool',
-      pool,
-      '-d',
-      'id',
-      bot,
-      '--cipd-package',
-      'cpython:infra/python/cpython/${platform}:latest',
-      '--named-cache',
-      cache,
-      mount_rel_path,
-      '--priority=10',
-      '--raw-cmd',
+      '-dimension',
+      'pool=' + pool,
+      '-dimension',
+      'id=' + bot,
+      '-cipd-package',
+      'cpython:infra/python/cpython/${platform}=latest',
+      '-named-cache',
+      cache + '=' + mount_rel_path,
+      '-priority',
+      '10',
       '--',
       'cpython/bin/python${EXECUTABLE_SUFFIX}',
       '-c',