[go: nahoru, domu]

[lacros] Stop isolating prebuilt ash-chrome

Stop isolating prebuilt ash-chrome because builders have switched to
build ash-chrome from tot.

Bug: 1129223, 1145628
Change-Id: I3d6894e9359473b415ea40d5511541aed89c5b15
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519833
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#824109}
diff --git a/testing/test.gni b/testing/test.gni
index 4876ec5..52fbadf 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -433,13 +433,7 @@
       ]
 
       if (_use_ash_chrome) {
-        if (also_build_ash_chrome) {
-          executable_args += [ "--ash-chrome-path=ash_clang_x64/chrome" ]
-        } else {
-          # TODO(crbug.com/1129223): Remove in ~1week after
-          # http://crrev.com/c/2487696 lands and is not reverted.
-          executable_args += [ "--ash-chrome-version=for_bots" ]
-        }
+        executable_args += [ "--ash-chrome-path=ash_clang_x64/chrome" ]
       }
 
       if (is_asan) {
@@ -459,9 +453,6 @@
         "//build/lacros/test_runner.py",
         "//.vpython",
       ]
-      if (_use_ash_chrome) {
-        data += [ "//build/lacros/prebuilt_ash_chrome/for_bots" ]
-      }
     }
 
     executable(target_name) {