Revert "Remove chromedriver/cipd."

This reverts commit 14bdb1d3.

Reason for revert: Might break Clank x86 builders.
Please see:
https://bugs.chromium.org/p/chromium/issues/detail?id=1056974


Original change's description:
> Remove chromedriver/cipd.
> 
> Change-Id: I5d81e5569a061d0e4609449c49835e61a810bae0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2073120
> Auto-Submit: Andrew Luo <aluo@chromium.org>
> Reviewed-by: John Chen <johnchen@chromium.org>
> Reviewed-by: Changwan Ryu <changwan@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Commit-Queue: Scott Violet <sky@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#744790}

TBR=sky@chromium.org,changwan@chromium.org,johnchen@chromium.org,jbudorick@chromium.org,aluo@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I7ea9fa3f9c0ee7951ae7a1d46770b2d1ebce9ada
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083751Reviewed-by: Xing Liu <xingliu@chromium.org>
Reviewed-by: Andrew Luo <aluo@chromium.org>
Reviewed-by: Changwan Ryu <changwan@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746284}

DEPS

@@ -437,6 +437,17 @@ deps = {
     'dep_type': 'cipd',
   },
 
+  'src/chrome/test/chromedriver/cipd': {
+    'packages': [
+      {
+        'package': 'chromium/chrome/test/chromedriver/cipd',
+        'version': 'JvTGvPUc-qPtmBqyJhvc-1i28yILiGeTjqGi-BvjiN4C',
+      }
+    ],
+    'condition': 'checkout_android',
+    'dep_type': 'cipd',
+  },
+
   'src/chrome/test/data/autofill/captured_sites': {
     'packages': [
       {

android_webview/test/BUILD.gn

@@ -44,7 +44,6 @@ if (public_android_sdk) {
     data_deps = [
       "//android_webview:system_webview_apk",
       "//android_webview/tools/system_webview_shell:system_webview_shell_layout_test_apk",
-      "//chrome/test/chromedriver:chromedriver($host_toolchain)",
     ]
     set_sources_assignment_filter([ "#*" ])
     sources =

chrome/android/BUILD.gn

@@ -2320,7 +2320,6 @@ group("chrome_public_wpt") {
   data_deps = [
     ":chrome_public_apk",
     "//build/android:test_runner_py",
-    "//chrome/test/chromedriver:chromedriver($host_toolchain)",
   ]
   set_sources_assignment_filter([ "#*" ])
   sources = read_file("//testing/scripts/run_android_wpt.pydeps", "list lines")

chrome/test/chromedriver/cipd/.gitignore

+linux/

chrome/test/chromedriver/cipd/cipd.yaml

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml
+#
+# From https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html
+# TODO: Remove this CIPD package once chromedriver can be built with target_os=="android"
+
+package: chromium/chrome/test/chromedriver/cipd
+description: Archive of Chrome Driver Binaries
+data:
+  - file: linux/chromedriver

testing/buildbot/chromium.android.fyi.json

@@ -314,6 +314,13 @@
         "name": "chrome_public_wpt",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "chromium/chrome/test/chromedriver/cipd",
+              "location": "chrome/test/chromedriver/cipd",
+              "revision": "JvTGvPUc-qPtmBqyJhvc-1i28yILiGeTjqGi-BvjiN4C"
+            }
+          ],
           "dimension_sets": [
             {
               "device_os": "PQ3A.190801.002",
@@ -341,6 +348,13 @@
         "name": "system_webview_wpt",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "chromium/chrome/test/chromedriver/cipd",
+              "location": "chrome/test/chromedriver/cipd",
+              "revision": "JvTGvPUc-qPtmBqyJhvc-1i28yILiGeTjqGi-BvjiN4C"
+            }
+          ],
           "dimension_sets": [
             {
               "device_os": "PQ3A.190801.002",
@@ -368,6 +382,13 @@
         "name": "weblayer_shell_wpt",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "chromium/chrome/test/chromedriver/cipd",
+              "location": "chrome/test/chromedriver/cipd",
+              "revision": "JvTGvPUc-qPtmBqyJhvc-1i28yILiGeTjqGi-BvjiN4C"
+            }
+          ],
           "dimension_sets": [
             {
               "device_os": "PQ3A.190801.002",
@@ -447,6 +468,13 @@
         "name": "chrome_public_wpt",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "chromium/chrome/test/chromedriver/cipd",
+              "location": "chrome/test/chromedriver/cipd",
+              "revision": "JvTGvPUc-qPtmBqyJhvc-1i28yILiGeTjqGi-BvjiN4C"
+            }
+          ],
           "dimension_sets": [
             {
               "device_os": "PQ3A.190801.002",
@@ -471,6 +499,13 @@
         "name": "system_webview_wpt",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "chromium/chrome/test/chromedriver/cipd",
+              "location": "chrome/test/chromedriver/cipd",
+              "revision": "JvTGvPUc-qPtmBqyJhvc-1i28yILiGeTjqGi-BvjiN4C"
+            }
+          ],
           "dimension_sets": [
             {
               "device_os": "PQ3A.190801.002",
@@ -495,6 +530,13 @@
         "name": "weblayer_shell_wpt",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "chromium/chrome/test/chromedriver/cipd",
+              "location": "chrome/test/chromedriver/cipd",
+              "revision": "JvTGvPUc-qPtmBqyJhvc-1i28yILiGeTjqGi-BvjiN4C"
+            }
+          ],
           "dimension_sets": [
             {
               "device_os": "PQ3A.190801.002",

testing/buildbot/gn_isolate_map.pyl

@@ -483,7 +483,6 @@
     "args": [
       "--product=chrome_android",
       "--apk=apks/ChromePublic.apk",
-      "--webdriver-binary=clang_x64/chromedriver",
       "-vvv",
     ],
   },
@@ -1552,7 +1551,6 @@
       "--product=android_webview",
       "--apk=apks/SystemWebView.apk",
       "--system-webview-shell=apks/SystemWebViewShell.apk",
-      "--webdriver-binary=clang_x64/chromedriver",
       "-vvv",
     ],
   },
@@ -1786,7 +1784,6 @@
       "--product=android_weblayer",
       "--weblayer-shell=apks/WebLayerShell.apk",
       "--weblayer-support=apks/WebLayerSupport.apk",
-      "--webdriver-binary=clang_x64/chromedriver",
       "-vvv",
     ],
   },

testing/buildbot/test_suites.pyl

@@ -380,6 +380,13 @@
           'shards': 15,
           'expiration': 18000,
           'hard_timeout': 14400,
+          'cipd_packages': [
+            {
+              "cipd_package": 'chromium/chrome/test/chromedriver/cipd',
+              'location': 'chrome/test/chromedriver/cipd',
+              'revision': 'JvTGvPUc-qPtmBqyJhvc-1i28yILiGeTjqGi-BvjiN4C',
+            }
+          ]
         },
       },
     },
@@ -3345,6 +3352,13 @@
           'shards': 15,
           'expiration': 18000,
           'hard_timeout': 14400,
+          'cipd_packages': [
+            {
+              "cipd_package": 'chromium/chrome/test/chromedriver/cipd',
+              'location': 'chrome/test/chromedriver/cipd',
+              'revision': 'JvTGvPUc-qPtmBqyJhvc-1i28yILiGeTjqGi-BvjiN4C',
+            }
+          ]
         },
       },
     },
@@ -3395,6 +3409,13 @@
           'shards': 15,
           'expiration': 18000,
           'hard_timeout': 14400,
+          'cipd_packages': [
+            {
+              "cipd_package": 'chromium/chrome/test/chromedriver/cipd',
+              'location': 'chrome/test/chromedriver/cipd',
+              'revision': 'JvTGvPUc-qPtmBqyJhvc-1i28yILiGeTjqGi-BvjiN4C',
+            }
+          ]
         },
       },
     },

testing/scripts/run_android_wpt.py

@@ -51,6 +51,8 @@ from devil.android.tools import system_app
 from devil.android.tools import webview_app
 
 
+DEFAULT_WEBDRIVER = os.path.join(SRC_DIR, 'chrome', 'test', 'chromedriver',
+                                 'cipd', 'linux', 'chromedriver')
 DEFAULT_WPT = os.path.join(SRC_DIR, 'third_party', 'blink', 'web_tests',
                            'external', 'wpt', 'wpt')
 
@@ -158,9 +160,10 @@ class WPTAndroidAdapter(common.BaseIsolatedScriptArgsAdapter):
     class WPTPassThroughArgs(PassThroughArgs):
       pass_through_args = self.pass_through_wpt_args
 
-    parser.add_argument('--webdriver-binary', required=True,
+    parser.add_argument('--webdriver-binary', default=DEFAULT_WEBDRIVER,
                         help='Path of the webdriver binary.  It needs to have'
-                        ' the same major version as the apk.')
+                        ' the same major version as the apk.  Defaults to cipd'
+                        ' archived version (near ToT).')
     parser.add_argument('--wpt-path', default=DEFAULT_WPT,
                         help='Controls the path of the WPT runner to use'
                         ' (therefore tests).  Defaults the revision rolled into'

weblayer/shell/android/BUILD.gn

@@ -198,7 +198,6 @@ group("weblayer_shell_wpt") {
     ":weblayer_shell_apk",
     ":weblayer_support_apk",
     "//build/android:test_runner_py",
-    "//chrome/test/chromedriver:chromedriver($host_toolchain)",
   ]
   set_sources_assignment_filter([ "#*" ])
   sources = read_file("//testing/scripts/run_android_wpt.pydeps", "list lines")