Move shared test infrastructure files to accessibility/common

In an effort to better share test infrastructure, the first step is to
move the currently shared files into a shared directory.

AX-Relnotes: n/a.
Bug: 1078119
Change-Id: I68240eea961dd6ca733cca483332dbd6caaa230d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209673
Commit-Queue: Anastasia Helfinstein <anastasi@google.com>
Reviewed-by: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772050}

chrome/browser/resources/chromeos/accessibility/autoclick/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import(
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni")
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
 import("//third_party/closure_compiler/compile_js.gni")
@@ -85,7 +85,7 @@ source_set("browser_tests") {
 
     # The test uses data from the original location, not the copied one.
     "//chrome/browser/resources/chromeos/accessibility/autoclick/",
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/",
+    "//chrome/browser/resources/chromeos/accessibility/common/",
     "//ui/webui/resources/js/cr.js",
   ]
   data += js2gtest_js_libraries
@@ -95,7 +95,7 @@ js2gtest("autoclick_extjs_tests") {
   test_type = "extension"
   sources = [ "autoclick_test.js" ]
   gen_include_files = [
-    "../chromevox/testing/callback_helper.js",
+    "../common/testing/callback_helper.js",
     "mock_accessibility_private.js",
   ]
 

chrome/browser/resources/chromeos/accessibility/autoclick/autoclick_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-GEN_INCLUDE(['../chromevox/testing/callback_helper.js']);
+GEN_INCLUDE(['../common/testing/callback_helper.js']);
 GEN_INCLUDE(['mock_accessibility_private.js']);
 
 /**

chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn

@@ -3,11 +3,12 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import(
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
 import("//third_party/closure_compiler/compile_js.gni")
-import("run_jsbundler.gni")
 
 declare_args() {
   # Whether to compress the main Chromevox javascript files or load the
@@ -387,8 +388,8 @@ if (is_chromeos) {
       "testing/mock_feedback_test.js",
     ]
     gen_include_files = [
-      "testing/assert_additions.js",
-      "testing/callback_helper.js",
+      "../common/testing/assert_additions.js",
+      "../common/testing/callback_helper.js",
       "testing/chromevox_unittest_base.js",
       "testing/mock_feedback.js",
     ]
@@ -426,8 +427,8 @@ if (is_chromeos) {
       "panel/panel_test.js",
     ]
     gen_include_files = [
-      "testing/assert_additions.js",
-      "testing/callback_helper.js",
+      "../common/testing/assert_additions.js",
+      "../common/testing/callback_helper.js",
       "testing/chromevox_e2e_test_base.js",
       "testing/chromevox_next_e2e_test_base.js",
       "testing/mock_feedback.js",

chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_e2e_test_base.js

@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-GEN_INCLUDE(['common.js', 'callback_helper.js', 'assert_additions.js']);
+GEN_INCLUDE([
+  'common.js', '../../common/testing/assert_additions.js',
+  '../../common/testing/callback_helper.js'
+]);
 
 /**
  * Base test fixture for ChromeVox end to end tests.

chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_unittest_base.js

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-GEN_INCLUDE(['assert_additions.js']);
-GEN_INCLUDE(['common.js', 'callback_helper.js']);
+GEN_INCLUDE(['../../common/testing/assert_additions.js']);
+GEN_INCLUDE(['common.js', '../../common/testing/callback_helper.js']);
 
 /**
  * Base test fixture for ChromeVox unit tests.

chrome/browser/resources/chromeos/accessibility/common/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import(
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni")
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
@@ -111,12 +111,12 @@ js2gtest("accessibility_tests") {
     "tree_walker_test.js",
   ]
   gen_include_files = [
-    "../chromevox/testing/assert_additions.js",
-    "../chromevox/testing/callback_helper.js",
     "../chromevox/testing/chromevox_e2e_test_base.js",
     "../chromevox/testing/chromevox_next_e2e_test_base.js",
     "../chromevox/testing/mock_feedback.js",
     "array_util.js",
+    "testing/assert_additions.js",
+    "testing/callback_helper.js",
   ]
 
   if (is_chromeos) {

chrome/browser/resources/chromeos/accessibility/common/automation_util_test.js

@@ -5,7 +5,7 @@
 // Include test fixture.
 GEN_INCLUDE([
   '../chromevox/testing/chromevox_next_e2e_test_base.js',
-  '../chromevox/testing/assert_additions.js', '../chromevox/testing/snippets.js'
+  'testing/assert_additions.js', '../chromevox/testing/snippets.js'
 ]);
 
 /**

chrome/browser/resources/chromeos/accessibility/select_to_speak/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import(
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni")
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
@@ -65,7 +65,7 @@ source_set("browser_tests") {
     "$root_out_dir/test_data/chrome/browser/resources/chromeos/accessibility/select_to_speak/",
 
     # The test uses data from the original location, not the copied one.
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/",
+    "//chrome/browser/resources/chromeos/accessibility/common/",
     "//chrome/browser/resources/chromeos/accessibility/select_to_speak/",
     "//ui/webui/resources/js/cr.js",
   ]
@@ -80,7 +80,7 @@ js2gtest("select_to_speak_extjs_tests") {
     "select_to_speak_prefs_test.js",
   ]
   gen_include_files = [
-    "../chromevox/testing/callback_helper.js",
+    "../common/testing/callback_helper.js",
     "mock_storage.js",
     "mock_tts.js",
     "select_to_speak_e2e_test_base.js",

chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_e2e_test_base.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-GEN_INCLUDE(['../chromevox/testing/callback_helper.js']);
+GEN_INCLUDE(['../common/testing/callback_helper.js']);
 
 /**
  * Base class for browser tests for select-to-speak.

chrome/browser/resources/chromeos/accessibility/switch_access/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import(
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni")
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
@@ -93,7 +93,7 @@ source_set("browser_tests") {
   deps = [ ":switch_access_extjs_tests" ]
 
   data = [
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/",
+    "//chrome/browser/resources/chromeos/accessibility/common/",
     "//chrome/browser/resources/chromeos/accessibility/switch_access/",
     "//ui/webui/resources/js/cr.js",
   ]
@@ -112,8 +112,8 @@ js2gtest("switch_access_extjs_tests") {
     "text_navigation_manager_test.js",
   ]
   gen_include_files = [
-    "../chromevox/testing/assert_additions.js",
-    "../chromevox/testing/callback_helper.js",
+    "../common/testing/assert_additions.js",
+    "../common/testing/callback_helper.js",
     "switch_access_e2e_test_base.js",
   ]
 

chrome/browser/resources/chromeos/accessibility/switch_access/switch_access_e2e_test_base.js

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 GEN_INCLUDE([
-  '../chromevox/testing/callback_helper.js',
-  '../chromevox/testing/assert_additions.js'
+  '../common/testing/callback_helper.js',
+  '../common/testing/assert_additions.js'
 ]);
 
 /**

ui/accessibility/extensions/chromevoxclassic/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import(
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni")
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
 import(
     "//chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings.gni")
 import("//chrome/common/features.gni")
@@ -586,8 +586,8 @@ js2gtest("chromevox_unitjs_tests") {
     "walkers/word_walker_test.unitjs",
   ]
   gen_include_files = [
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/testing/assert_additions.js",
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/testing/callback_helper.js",
+    "//chrome/browser/resources/chromeos/accessibility/common/testing/assert_additions.js",
+    "//chrome/browser/resources/chromeos/accessibility/common/testing/callback_helper.js",
     "//ui/accessibility/extensions/chromevoxclassic/testing/chromevox_unittest_base.js",
   ]
 

ui/accessibility/extensions/chromevoxclassic/testing/chromevox_unittest_base.js

@@ -3,11 +3,14 @@
 // found in the LICENSE file.
 
 GEN_INCLUDE([
-  '//chrome/browser/resources/chromeos/accessibility/chromevox/testing/assert_additions.js'
+    '//chrome/browser/resources/chromeos/accessibility/common/testing/' +
+        'assert_additions.js'
 ]);
 GEN_INCLUDE([
-  '//chrome/browser/resources/chromeos/accessibility/chromevox/testing/common.js',
-  '//chrome/browser/resources/chromeos/accessibility/chromevox/testing/callback_helper.js'
+  '//chrome/browser/resources/chromeos/accessibility/chromevox/testing/' +
+      'common.js',
+  '//chrome/browser/resources/chromeos/accessibility/common/testing/' +
+      'callback_helper.js'
 ]);
 
 /**