BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 28 insertions, 42 deletions

diff --git a/chromium/docs/gpu/gpu_testing.md b/chromium/docs/gpu/gpu_testing.md
index a2d9b20470d..958801a0f14 100644
--- a/chromium/docs/gpu/gpu_testing.md
+++ b/chromium/docs/gpu/gpu_testing.md
@@ -278,11 +278,11 @@ being tested. This *should* mean that the pixel tests will automatically work
 when run locally. However, if the local run detection code fails for some
 reason, you can manually pass some flags to force the same behavior:
 
-In order to get around the local run issues, simply pass the `--local-run=1`
-flag to the tests. This will disable uploading, but otherwise go through the
-same steps as a test normally would. Each test will also print out `file://`
-URLs to the produced image, the closest image for the test known to Gold, and
-the diff between the two.
+In order to get around the local run issues, simply pass the
+`--local-pixel-tests` flag to the tests. This will disable uploading, but
+otherwise go through the same steps as a test normally would. Each test will
+also print out `file://` URLs to the produced image, the closest image for the
+test known to Gold, and the diff between the two.
 
 Because the image produced by the test locally is likely slightly different from
 any of the approved images in Gold, local test runs are likely to fail during
@@ -292,7 +292,7 @@ comparison. When using `--no-skia-gold-failure`, you'll also need to pass the
 `--passthrough` flag in order to actually see the link output.
 
 Example usage:
-`run_gpu_integration_test.py pixel --no-skia-gold-failure --local-run=1
+`run_gpu_integration_test.py pixel --no-skia-gold-failure --local-pixel-tests
 --passthrough`
 
 If, for some reason, the local run code is unable to determine what the git
@@ -300,7 +300,7 @@ revision is, simply pass `--git-revision aabbccdd`. Note that `aabbccdd` must
 be replaced with an actual Chromium src revision (typically whatever revision
 origin/master is currently synced to) in order for the tests to work. This can
 be done automatically using:
-``run_gpu_integration_test.py pixel --no-skia-gold-failure --local-run
+``run_gpu_integration_test.py pixel --no-skia-gold-failure --local-pixel-tests
 --passthrough --git-revision `git rev-parse origin/master` ``
 
 ## Running Binaries from the Bots Locally
@@ -628,6 +628,9 @@ Here are some examples:
 *   A change to Blink's memory purging primitive which caused intermittent
     timeouts of WebGL conformance tests on all platforms ([Issue
     840988](http://crbug.com/840988)).
+*   Screen DPI being inconsistent across seemingly identical Linux machines,
+    causing the Maps pixel test to flakily produce incorrectly sized images
+    ([Issue 1091410](https://crbug.com/1091410)).
 
 If you notice flaky test failures either on the GPU waterfalls or try servers,
 please file bugs right away with the component Internals>GPU>Testing and
diff --git a/chromium/docs/gpu/gpu_testing_bot_details.md b/chromium/docs/gpu/gpu_testing_bot_details.md
index 7255a9ea027..84f40dc0311 100644
--- a/chromium/docs/gpu/gpu_testing_bot_details.md
+++ b/chromium/docs/gpu/gpu_testing_bot_details.md
@@ -251,14 +251,11 @@ sorry):
 *   [`pools.cfg`][pools.cfg]
     *   Defines the Swarming pools for GCEs and Mac VMs used for manually
         triggered trybots.
-*   [`bot_config.py`][bot_config.py]
-    *   Defines the stable GPU driver and OS versions in GPU Swarming pools.
 
 [infradata/config]:                https://chrome-internal.googlesource.com/infradata/config
 [gpu.star]:                        https://chrome-internal.googlesource.com/infradata/config/+/master/configs/chromium-swarm/starlark/bots/chromium/gpu.star
 [chromium.star]:                   https://chrome-internal.googlesource.com/infradata/config/+/master/configs/chromium-swarm/starlark/bots/chromium/chromium.star
 [pools.cfg]:                       https://chrome-internal.googlesource.com/infradata/config/+/master/configs/chromium-swarm/pools.cfg
-[bot_config.py]:                   https://chrome-internal.googlesource.com/infradata/config/+/master/configs/chromium-swarm/scripts/bot_config.py
 [main.star]:                       https://chrome-internal.googlesource.com/infradata/config/+/master/main.star
 [vms.cfg]:                         https://chrome-internal.googlesource.com/infradata/config/+/master/configs/gce-provider/vms.cfg
 
@@ -666,10 +663,6 @@ or OS update. To do this:
 1.  Make sure that all of the current Swarming jobs for this OS and GPU
     configuration are targeted at the "stable" version of the driver and the OS
     in [`waterfalls.pyl`][waterfalls.pyl] and [`mixins.pyl`][mixins.pyl].
-    Make sure that there are "named" stable versions of the driver and the OS
-    there, which target the `_TARGETED_DRIVER_VERSIONS` and
-    `_TARGETED_OS_VERSIONS` dictionaries in [`bot_config.py`][bot_config.py]
-    (Google internal).
 1.  File a `Build Infrastructure` bug, component `Infra>Labs`, to have ~4 of
     the physical machines already in the Swarming pool upgraded to the new
     version of the driver or the OS.
@@ -684,51 +677,41 @@ or OS update. To do this:
     it'll be necessary to follow the instructions on
     [updating Gold baselines (step #4)][updating gold baselines].
 1.  Watch the new machine for a day or two to make sure it's stable.
-1.  When it is, update [`bot_config.py`][bot_config.py] (Google internal)
-    to *add* a mapping between the new driver version and the "stable" version.
-    For example:
+1.  When it is, add the experimental driver/OS to the `_stable` mixin using the
+    swarming OR operator `|`. For example:
 
     ```
-    _TARGETED_DRIVER_VERSIONS = {
-      # NVIDIA Quadro P400, Ubuntu Stable version
-      '10de:1cb3-384.90': 'nvidia-quadro-p400-ubuntu-stable',
-      # NVIDIA Quadro P400, new Ubuntu Stable version
-      '10de:1cb3-410.78': 'nvidia-quadro-p400-ubuntu-stable',
-      # ...
-    }
-    ```
-
-    And/or a mapping between the new OS version and the "stable" version.
-    For example:
-
-    ```
-    _TARGETED_OS_VERSIONS = {
-      # Linux NVIDIA Quadro P400
-      '10de:1cb3': {
-        'Ubuntu-14.04': 'linux-nvidia-stable',
-        'Ubuntu-19.04': 'linux-nvidia-stable',
+    'win10_intel_hd_630_stable': {
+      'swarming': {
+        'dimensions': {
+          'gpu': '8086:5912-26.20.100.7870|8086:5912-26.20.100.8141',
+          'os': 'Windows-10',
+          'pool': 'chromium.tests.gpu',
+        },
       },
-      # ...
     }
     ```
 
-    The new driver or OS version should match the one just added for the
-    experimental bot. Get this CL reviewed and landed.
-    [Sample CL (Google internal)][sample targeted version cl].
+    This will cause tests triggered using the `_stable` mixin to run on either
+    the old stable dimension or the experimental/new stable dimension.
+
+    **NOTE** There is a hard cap of 8 combinations in swarming, so you can only
+    use the OR operator in up to 3 dimensions if each dimension only has two
+    options. More than two options per dimension is allowed as long as the total
+    number of combinations is 8 or less.
 1.  After it lands, ask the Chrome Infrastructure Labs team to roll out the
     driver update across all of the similarly configured bots in the swarming
     pool.
 1.  If necessary, update pixel test expectations and remove the suppressions
     added above.
-1.  Remove the old driver or OS version from [`bot_config.py`][bot_config.py],
-    leaving the "stable" driver version pointing at the newly upgraded version.
+1.  Remove the old driver or OS version from the `_stable` mixin, leaving just
+    the new stable version.
 
 Note that we leave the experimental bot in place. We could reclaim it, but it
 seems worthwhile to continuously test the "next" version of graphics drivers as
 well as the current stable ones.
 
 [sample driver cl]: https://chromium-review.googlesource.com/c/chromium/src/+/1726875
-[sample targeted version cl]: https://chrome-internal-review.googlesource.com/c/infradata/config/+/1602377
 [updating gold baselines]: https://chromium.googlesource.com/chromium/src/+/HEAD/docs/gpu/pixel_wrangling.md#how-to-keep-the-bots-green
 
 ## Credentials for various servers