Move ash/components/arc to chromeos/ash/experiences/arc Part 5.

This CL moves ash/components/arc/[t-w].* directories
(remaining all sub directories, except mojom).

BUG=386148857
TEST=Tryjob

Change-Id: Ic0f4c206d83ce3ff48a3e204aed4524b559a0164
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6164665
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Peter McNeeley <petermcneeley@google.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1407609}

ash/components/arc/BUILD.gn

@@ -106,17 +106,17 @@ static_library("arc") {
     "//chromeos/ash/experiences/arc/sensor/arc_iio_sensor_bridge.h",
     "//chromeos/ash/experiences/arc/system_ui/arc_system_ui_bridge.cc",
     "//chromeos/ash/experiences/arc/system_ui/arc_system_ui_bridge.h",
-    "timer/arc_timer_bridge.cc",
-    "timer/arc_timer_bridge.h",
-    "usb/usb_host_bridge.cc",
-    "usb/usb_host_bridge.h",
-    "usb/usb_host_ui_delegate.h",
-    "volume_mounter/arc_volume_mounter_bridge.cc",
-    "volume_mounter/arc_volume_mounter_bridge.h",
-    "wake_lock/arc_wake_lock_bridge.cc",
-    "wake_lock/arc_wake_lock_bridge.h",
-    "window/arc_window_watcher.cc",
-    "window/arc_window_watcher.h",
+    "//chromeos/ash/experiences/arc/timer/arc_timer_bridge.cc",
+    "//chromeos/ash/experiences/arc/timer/arc_timer_bridge.h",
+    "//chromeos/ash/experiences/arc/usb/usb_host_bridge.cc",
+    "//chromeos/ash/experiences/arc/usb/usb_host_bridge.h",
+    "//chromeos/ash/experiences/arc/usb/usb_host_ui_delegate.h",
+    "//chromeos/ash/experiences/arc/volume_mounter/arc_volume_mounter_bridge.cc",
+    "//chromeos/ash/experiences/arc/volume_mounter/arc_volume_mounter_bridge.h",
+    "//chromeos/ash/experiences/arc/wake_lock/arc_wake_lock_bridge.cc",
+    "//chromeos/ash/experiences/arc/wake_lock/arc_wake_lock_bridge.h",
+    "//chromeos/ash/experiences/arc/window/arc_window_watcher.cc",
+    "//chromeos/ash/experiences/arc/window/arc_window_watcher.h",
   ]
 
   public_deps = [
@@ -128,7 +128,6 @@ static_library("arc") {
 
   deps = [
     "//ash",
-    "//ash/components/arc/vector_icons",
     "//ash/keyboard/ui",
     "//ash/public/cpp",
     "//ash/public/cpp/external_arc:external_arc",
@@ -156,6 +155,7 @@ static_library("arc") {
     "//chromeos/ash/components/disks",
     "//chromeos/ash/components/login/login_state",
     "//chromeos/ash/components/network",
+    "//chromeos/ash/experiences/arc/vector_icons",
     "//chromeos/components/disks:prefs",
     "//chromeos/components/sensors:sensors",
     "//chromeos/dbus/permission_broker",
@@ -296,9 +296,9 @@ static_library("compat_mode_test_support") {
 static_library("notification_test_support") {
   testonly = true
   sources = [
-    "test/connection_holder_util.h",
-    "test/fake_notifications_instance.cc",
-    "test/fake_notifications_instance.h",
+    "//chromeos/ash/experiences/arc/test/connection_holder_util.h",
+    "//chromeos/ash/experiences/arc/test/fake_notifications_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_notifications_instance.h",
   ]
 
   public_deps = [
@@ -310,88 +310,88 @@ static_library("notification_test_support") {
 static_library("arc_test_support") {
   testonly = true
   sources = [
-    "test/arc_payment_app_bridge_test_support.cc",
-    "test/arc_payment_app_bridge_test_support.h",
-    "test/arc_task_window_builder.cc",
-    "test/arc_task_window_builder.h",
-    "test/arc_util_test_support.cc",
-    "test/arc_util_test_support.h",
-    "test/fake_adbd_monitor_instance.cc",
-    "test/fake_adbd_monitor_instance.h",
-    "test/fake_app_host.cc",
-    "test/fake_app_host.h",
-    "test/fake_app_instance.cc",
-    "test/fake_app_instance.h",
-    "test/fake_arc_bridge_host.cc",
-    "test/fake_arc_bridge_host.h",
-    "test/fake_arc_dlc_install_notification_delegate.cc",
-    "test/fake_arc_dlc_install_notification_delegate.h",
-    "test/fake_arc_icon_cache.cc",
-    "test/fake_arc_icon_cache.h",
-    "test/fake_arc_intent_helper_mojo.cc",
-    "test/fake_arc_intent_helper_mojo.h",
-    "test/fake_arc_session.cc",
-    "test/fake_arc_session.h",
-    "test/fake_backup_settings_instance.cc",
-    "test/fake_backup_settings_instance.h",
-    "test/fake_bluetooth_instance.cc",
-    "test/fake_bluetooth_instance.h",
-    "test/fake_cert_manager.h",
-    "test/fake_chrome_feature_flags_instance.cc",
-    "test/fake_chrome_feature_flags_instance.h",
-    "test/fake_compatibility_mode_instance.cc",
-    "test/fake_compatibility_mode_instance.h",
-    "test/fake_disk_space_instance.cc",
-    "test/fake_disk_space_instance.h",
-    "test/fake_file_system_instance.cc",
-    "test/fake_file_system_instance.h",
-    "test/fake_iio_sensor_instance.cc",
-    "test/fake_iio_sensor_instance.h",
-    "test/fake_intent_helper_host.cc",
-    "test/fake_intent_helper_host.h",
-    "test/fake_intent_helper_instance.cc",
-    "test/fake_intent_helper_instance.h",
-    "test/fake_keymint_instance.cc",
-    "test/fake_keymint_instance.h",
-    "test/fake_memory_instance.cc",
-    "test/fake_memory_instance.h",
-    "test/fake_nearby_share_instance.cc",
-    "test/fake_nearby_share_instance.h",
-    "test/fake_net_instance.cc",
-    "test/fake_net_instance.h",
-    "test/fake_pip_instance.cc",
-    "test/fake_pip_instance.h",
-    "test/fake_policy_instance.cc",
-    "test/fake_policy_instance.h",
-    "test/fake_power_instance.cc",
-    "test/fake_power_instance.h",
-    "test/fake_privacy_items_instance.cc",
-    "test/fake_privacy_items_instance.h",
-    "test/fake_process_instance.cc",
-    "test/fake_process_instance.h",
-    "test/fake_sharesheet_instance.cc",
-    "test/fake_sharesheet_instance.h",
-    "test/fake_system_state_instance.cc",
-    "test/fake_system_state_instance.h",
-    "test/fake_system_ui_instance.cc",
-    "test/fake_system_ui_instance.h",
-    "test/fake_timer_instance.cc",
-    "test/fake_timer_instance.h",
-    "test/fake_tracing_instance.cc",
-    "test/fake_tracing_instance.h",
-    "test/fake_volume_mounter_instance.cc",
-    "test/fake_volume_mounter_instance.h",
-    "test/fake_wake_lock_instance.cc",
-    "test/fake_wake_lock_instance.h",
-    "test/fake_wallpaper_instance.cc",
-    "test/fake_wallpaper_instance.h",
-    "test/fake_webapk_instance.cc",
-    "test/fake_webapk_instance.h",
+    "//chromeos/ash/experiences/arc/test/arc_payment_app_bridge_test_support.cc",
+    "//chromeos/ash/experiences/arc/test/arc_payment_app_bridge_test_support.h",
+    "//chromeos/ash/experiences/arc/test/arc_task_window_builder.cc",
+    "//chromeos/ash/experiences/arc/test/arc_task_window_builder.h",
+    "//chromeos/ash/experiences/arc/test/arc_util_test_support.cc",
+    "//chromeos/ash/experiences/arc/test/arc_util_test_support.h",
+    "//chromeos/ash/experiences/arc/test/fake_adbd_monitor_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_adbd_monitor_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_app_host.cc",
+    "//chromeos/ash/experiences/arc/test/fake_app_host.h",
+    "//chromeos/ash/experiences/arc/test/fake_app_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_app_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_arc_bridge_host.cc",
+    "//chromeos/ash/experiences/arc/test/fake_arc_bridge_host.h",
+    "//chromeos/ash/experiences/arc/test/fake_arc_dlc_install_notification_delegate.cc",
+    "//chromeos/ash/experiences/arc/test/fake_arc_dlc_install_notification_delegate.h",
+    "//chromeos/ash/experiences/arc/test/fake_arc_icon_cache.cc",
+    "//chromeos/ash/experiences/arc/test/fake_arc_icon_cache.h",
+    "//chromeos/ash/experiences/arc/test/fake_arc_intent_helper_mojo.cc",
+    "//chromeos/ash/experiences/arc/test/fake_arc_intent_helper_mojo.h",
+    "//chromeos/ash/experiences/arc/test/fake_arc_session.cc",
+    "//chromeos/ash/experiences/arc/test/fake_arc_session.h",
+    "//chromeos/ash/experiences/arc/test/fake_backup_settings_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_backup_settings_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_bluetooth_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_bluetooth_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_cert_manager.h",
+    "//chromeos/ash/experiences/arc/test/fake_chrome_feature_flags_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_chrome_feature_flags_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_compatibility_mode_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_compatibility_mode_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_disk_space_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_disk_space_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_file_system_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_file_system_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_iio_sensor_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_iio_sensor_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_intent_helper_host.cc",
+    "//chromeos/ash/experiences/arc/test/fake_intent_helper_host.h",
+    "//chromeos/ash/experiences/arc/test/fake_intent_helper_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_keymint_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_keymint_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_memory_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_memory_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_nearby_share_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_nearby_share_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_net_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_net_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_pip_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_pip_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_policy_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_policy_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_power_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_power_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_privacy_items_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_privacy_items_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_process_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_process_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_sharesheet_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_sharesheet_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_system_state_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_system_state_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_system_ui_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_system_ui_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_timer_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_timer_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_tracing_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_tracing_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_volume_mounter_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_volume_mounter_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_wake_lock_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_wake_lock_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_wallpaper_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_wallpaper_instance.h",
+    "//chromeos/ash/experiences/arc/test/fake_webapk_instance.cc",
+    "//chromeos/ash/experiences/arc/test/fake_webapk_instance.h",
   ]
 
   data = [
-    "//ash/components/arc/test/data/icons/",
-    "//ash/components/arc/test/data/mem_profile/",
+    "//chromeos/ash/experiences/arc/test/data/icons/",
+    "//chromeos/ash/experiences/arc/test/data/mem_profile/",
   ]
 
   public_deps = [
@@ -471,13 +471,13 @@ source_set("unit_tests") {
     "//chromeos/ash/experiences/arc/power/arc_power_bridge_unittest.cc",
     "//chromeos/ash/experiences/arc/sensor/arc_iio_sensor_bridge_unittest.cc",
     "//chromeos/ash/experiences/arc/system_ui/arc_system_ui_bridge_unittest.cc",
+    "//chromeos/ash/experiences/arc/timer/arc_timer_bridge_unittest.cc",
+    "//chromeos/ash/experiences/arc/usb/usb_host_bridge_unittest.cc",
+    "//chromeos/ash/experiences/arc/video_accelerator/arc_video_accelerator_util_unittest.cc",
+    "//chromeos/ash/experiences/arc/volume_mounter/arc_volume_mounter_bridge_unittest.cc",
+    "//chromeos/ash/experiences/arc/wake_lock/arc_wake_lock_bridge_unittest.cc",
     "arc_features_parser_unittest.cc",
     "arc_util_unittest.cc",
-    "timer/arc_timer_bridge_unittest.cc",
-    "usb/usb_host_bridge_unittest.cc",
-    "video_accelerator/arc_video_accelerator_util_unittest.cc",
-    "volume_mounter/arc_volume_mounter_bridge_unittest.cc",
-    "wake_lock/arc_wake_lock_bridge_unittest.cc",
   ]
 
   deps = [

ash/components/arc/arc_util_unittest.cc

@@ -11,7 +11,6 @@
 
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/test/ash_test_base.h"
 #include "base/base_switches.h"
@@ -27,6 +26,7 @@
 #include "chromeos/ash/components/dbus/upstart/fake_upstart_client.h"
 #include "chromeos/ash/components/install_attributes/stub_install_attributes.h"
 #include "chromeos/ash/experiences/arc/session/arc_vm_data_migration_status.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
 #include "components/account_id/account_id.h"
 #include "components/exo/shell_surface_util.h"
 #include "components/prefs/testing_pref_service.h"

ash/components/arc/mojom/BUILD.gn

@@ -226,9 +226,10 @@ mojom("mojom") {
           cpp = "::clockid_t"
         },
       ]
-      traits_headers = [ "//ash/components/arc/timer/arc_timer_mojom_traits.h" ]
+      traits_headers =
+          [ "//chromeos/ash/experiences/arc/timer/arc_timer_mojom_traits.h" ]
       traits_sources =
-          [ "//ash/components/arc/timer/arc_timer_mojom_traits.cc" ]
+          [ "//chromeos/ash/experiences/arc/timer/arc_timer_mojom_traits.cc" ]
     },
     {
       types = [
@@ -241,12 +242,8 @@ mojom("mojom") {
           cpp = "::ash::disks::DiskMountManager::MountEvent"
         },
       ]
-      traits_headers = [
-        "//ash/components/arc/volume_mounter/volume_mounter_mojom_traits.h",
-      ]
-      traits_sources = [
-        "//ash/components/arc/volume_mounter/volume_mounter_mojom_traits.cc",
-      ]
+      traits_headers = [ "//chromeos/ash/experiences/arc/volume_mounter/volume_mounter_mojom_traits.h" ]
+      traits_sources = [ "//chromeos/ash/experiences/arc/volume_mounter/volume_mounter_mojom_traits.cc" ]
     },
     {
       types = [
@@ -342,7 +339,7 @@ mojom("media") {
       traits_headers = [ "video_accelerator_mojom_traits.h" ]
       traits_sources = [ "video_accelerator_mojom_traits.cc" ]
       traits_public_deps = [
-        "//ash/components/arc/video_accelerator:common",
+        "//chromeos/ash/experiences/arc/video_accelerator:common",
         "//media",
         "//ui/gfx/geometry",
       ]

ash/components/arc/mojom/video_accelerator_mojom_traits.h

@@ -9,7 +9,7 @@
 
 #include "ash/components/arc/mojom/video_common.mojom-shared.h"
 #include "ash/components/arc/mojom/video_decoder.mojom-shared.h"
-#include "ash/components/arc/video_accelerator/video_frame_plane.h"
+#include "chromeos/ash/experiences/arc/video_accelerator/video_frame_plane.h"
 #include "media/base/color_plane_layout.h"
 #include "media/base/decoder_status.h"
 #include "media/base/status.h"

ash/public/cpp/external_arc/message_center/DEPS

@@ -1,7 +1,5 @@
 include_rules = [
   "+ash/components/arc/mojom/notifications.mojom.h",
-  "+ash/components/arc/test/connection_holder_util.h",
-  "+ash/components/arc/test/fake_notifications_instance.h",
   "+ash/system/message_center/message_center_constants.h",
   "+ash/system/message_center/message_view_factory.h",
   "+ash/system/notification_center/message_center_utils.h",
@@ -12,4 +10,6 @@ include_rules = [
   "+chromeos/ash/experiences/arc/session/connection_holder.h",
   "+chromeos/ash/experiences/arc/session/connection_observer.h",
   "+chromeos/ash/experiences/arc/session/mojo_channel.h",
+  "+chromeos/ash/experiences/arc/test/connection_holder_util.h",
+  "+chromeos/ash/experiences/arc/test/fake_notifications_instance.h",
 ]

ash/public/cpp/external_arc/message_center/arc_notification_manager_unittest.cc

@@ -10,8 +10,6 @@
 #include <utility>
 #include <vector>
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_notifications_instance.h"
 #include "ash/public/cpp/arc_app_id_provider.h"
 #include "ash/public/cpp/message_center/arc_notification_manager_delegate.h"
 #include "base/functional/callback.h"
@@ -20,6 +18,8 @@
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/task_environment.h"
 #include "chromeos/ash/experiences/arc/session/connection_holder.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_notifications_instance.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/apps/app_service/app_icon/app_icon_factory_unittest.cc

@@ -87,8 +87,9 @@ class AppIconFactoryTest : public testing::Test {
     base::FilePath base_path;
     std::string png_data_as_string;
     CHECK(base::PathService::Get(base::DIR_SRC_TEST_DATA_ROOT, &base_path));
-    base::FilePath icon_file_path = base_path.AppendASCII("ash")
-                                        .AppendASCII("components")
+    base::FilePath icon_file_path = base_path.AppendASCII("chromeos")
+                                        .AppendASCII("ash")
+                                        .AppendASCII("experiences")
                                         .AppendASCII("arc")
                                         .AppendASCII("test")
                                         .AppendASCII("data")

chrome/browser/apps/app_service/app_icon/arc_apps_icon_unittest.cc

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "ash/components/arc/mojom/app.mojom.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/containers/flat_map.h"
 #include "base/scoped_observation.h"
 #include "base/test/test_future.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/ash/app_list/arc/arc_app_test.h"
 #include "chrome/browser/extensions/chrome_app_icon.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/services/app_service/public/cpp/features.h"
 #include "content/public/test/browser_task_environment.h"
 #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"

chrome/browser/apps/app_service/app_install/app_install_service_ash_unittest.cc

@@ -6,8 +6,6 @@
 
 #include <memory>
 
-#include "ash/components/arc/test/fake_app_instance.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
 #include "base/test/test_future.h"
 #include "chrome/browser/apps/app_service/app_install/app_install.pb.h"
 #include "chrome/browser/apps/app_service/app_install/app_install_almanac_endpoint.h"
@@ -22,6 +20,8 @@
 #include "chromeos/ash/experiences/arc/app/arc_app_constants.h"
 #include "chromeos/ash/experiences/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "chromeos/ash/experiences/arc/intent_helper/intent_constants.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
 #include "components/services/app_service/public/cpp/intent_filter_util.h"
 #include "content/public/test/browser_task_environment.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"

chrome/browser/apps/app_service/app_install/arc_app_installer_unittest.cc

@@ -4,11 +4,11 @@
 
 #include "chrome/browser/apps/app_service/app_install/arc_app_installer.h"
 
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/test_future.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_test.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/apps/app_service/notifications_browsertest.cc

@@ -4,9 +4,6 @@
 
 #include <memory>
 
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "ash/public/cpp/external_arc/message_center/arc_notification_manager.h"
 #include "ash/public/cpp/message_center/arc_notification_manager_delegate.h"
 #include "ash/public/cpp/message_center/arc_notifications_host_initializer.h"
@@ -43,6 +40,9 @@
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
 #include "chromeos/ash/experiences/arc/session/connection_holder.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/ukm/test_ukm_recorder.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_navigation_observer.h"

chrome/browser/apps/app_service/publishers/arc_apps_unittest.cc

@@ -12,10 +12,6 @@
 #include "ash/components/arc/arc_util.h"
 #include "ash/components/arc/mojom/app.mojom.h"
 #include "ash/components/arc/mojom/intent_helper.mojom.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_instance.h"
-#include "ash/components/arc/test/fake_file_system_instance.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
 #include "ash/constants/ash_features.h"
 #include "base/functional/callback_helpers.h"
 #include "base/memory/raw_ptr.h"
@@ -54,6 +50,10 @@
 #include "chromeos/ash/experiences/arc/intent_helper/intent_filter.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_file_system_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/services/app_service/public/cpp/app_types.h"

chrome/browser/apps/app_service/publishers/publisher_unittest.cc

@@ -37,7 +37,6 @@
 #include "url/gurl.h"
 
 #if BUILDFLAG(IS_CHROMEOS)
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "ash/constants/ash_features.h"
 #include "chrome/browser/apps/app_service/publishers/arc_apps.h"
 #include "chrome/browser/apps/app_service/publishers/arc_apps_factory.h"
@@ -49,6 +48,7 @@
 #include "chrome/common/chrome_features.h"
 #include "chrome/grit/branded_strings.h"
 #include "chromeos/ash/components/login/login_state/login_state.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/services/app_service/public/cpp/app_capability_access_cache.h"
 #include "components/services/app_service/public/cpp/capability_access_update.h"
 #include "components/user_manager/scoped_user_manager.h"

chrome/browser/apps/app_service/webapk/webapk_install_task_unittest.cc

@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "ash/components/arc/mojom/webapk.mojom.h"
-#include "ash/components/arc/test/fake_webapk_instance.h"
 #include "ash/constants/ash_features.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
@@ -26,6 +25,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/fake_webapk_instance.h"
 #include "components/prefs/pref_service.h"
 #include "components/webapk/webapk.pb.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/apps/app_service/webapk/webapk_manager_unittest.cc

@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "ash/components/arc/mojom/app.mojom.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "ash/constants/ash_features.h"
 #include "base/strings/strcat.h"
 #include "base/test/metrics/histogram_tester.h"
@@ -26,6 +25,7 @@
 #include "chrome/browser/web_applications/test/fake_web_app_provider.h"
 #include "chrome/browser/web_applications/test/web_app_install_test_utils.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/prefs/pref_service.h"
 #include "components/services/app_service/public/cpp/app_registry_cache.h"
 #include "components/services/app_service/public/cpp/app_types.h"

chrome/browser/apps/app_service/webapk/webapk_policy_browsertest.cc

@@ -6,8 +6,6 @@
 #include <optional>
 
 #include "ash/components/arc/arc_features_parser.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_webapk_instance.h"
 #include "ash/constants/ash_features.h"
 #include "base/functional/bind.h"
 #include "base/test/bind.h"
@@ -21,6 +19,8 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_webapk_instance.h"
 #include "components/policy/policy_constants.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "content/public/test/browser_test.h"

chrome/browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_apitest.cc

@@ -4,9 +4,6 @@
 
 #include <memory>
 
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/path_service.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ash/arc/arc_util.h"
@@ -17,6 +14,9 @@
 #include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "content/public/test/browser_test.h"
 #include "extensions/common/switches.h"
 #include "extensions/test/extension_test_message_listener.h"

chrome/browser/ash/app_list/app_context_menu_unittest.cc

@@ -8,7 +8,6 @@
 #include <unordered_set>
 #include <vector>
 
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "ash/public/cpp/app_menu_constants.h"
 #include "base/functional/bind.h"
 #include "base/json/json_file_value_serializer.h"
@@ -41,6 +40,7 @@
 #include "chrome/browser/extensions/menu_manager_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/app_constants/constants.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/services/app_service/public/cpp/app_update.h"

chrome/browser/ash/app_list/app_service/app_service_promise_app_item_browsertest.cc

@@ -14,9 +14,6 @@
 #include "ash/app_list/model/app_list_item.h"
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/mojom/app.mojom.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "ash/constants/ash_features.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/public/cpp/app_list/app_list_types.h"
@@ -55,6 +52,9 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/ash/experiences/arc/session/connection_holder.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/services/app_service/public/cpp/app_types.h"
 #include "components/services/app_service/public/cpp/package_id.h"
 #include "components/sync/model/string_ordinal.h"

chrome/browser/ash/app_list/arc/arc_app_test.cc

@@ -8,13 +8,6 @@
 
 #include "ash/components/arc/arc_util.h"
 #include "ash/components/arc/mojom/app.mojom-shared.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_instance.h"
-#include "ash/components/arc/test/fake_arc_session.h"
-#include "ash/components/arc/test/fake_compatibility_mode_instance.h"
-#include "ash/components/arc/test/fake_intent_helper_host.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
 #include "ash/constants/ash_features.h"
 #include "base/command_line.h"
 #include "base/containers/contains.h"
@@ -40,6 +33,13 @@
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
+#include "chromeos/ash/experiences/arc/test/fake_compatibility_mode_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_host.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
 #include "components/user_manager/scoped_user_manager.h"
 #include "google_apis/gaia/gaia_id.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/ash/app_list/arc/arc_app_unittest.cc

@@ -16,9 +16,6 @@
 #include "ash/components/arc/arc_util.h"
 #include "ash/components/arc/mojom/app.mojom.h"
 #include "ash/components/arc/mojom/compatibility_mode.mojom.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_app_instance.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/shelf_model.h"
@@ -83,6 +80,9 @@
 #include "chromeos/ash/experiences/arc/app/arc_app_constants.h"
 #include "chromeos/ash/experiences/arc/metrics/arc_metrics_constants.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
 #include "components/services/app_service/public/cpp/app_launch_util.h"
 #include "components/services/app_service/public/cpp/app_registry_cache.h"
 #include "components/services/app_service/public/cpp/app_types.h"

chrome/browser/ash/app_list/arc/arc_app_utils_unittest.cc

@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/ash/app_list/arc/arc_app_utils.h"
+
 #include <utility>
 
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/run_loop.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_test.h"
-#include "chrome/browser/ash/app_list/arc/arc_app_utils.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/app_list/arc/arc_package_install_priority_handler_unittest.cc

@@ -5,11 +5,11 @@
 #include "chrome/browser/ash/app_list/arc/arc_package_install_priority_handler.h"
 
 #include "ash/components/arc/arc_features.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_test.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/app_list/arc/arc_usb_host_permission_browsertest.cc

@@ -2,13 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.h"
-
 #include "ash/components/arc/arc_util.h"
 #include "ash/components/arc/mojom/app.mojom.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
 #include "base/memory/raw_ptr.h"
@@ -17,12 +12,16 @@
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_utils.h"
+#include "chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.h"
 #include "chrome/browser/ash/arc/arc_util.h"
 #include "chrome/browser/ash/arc/session/arc_session_manager.h"
 #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/user_manager/scoped_user_manager.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"

chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.cc

@@ -8,12 +8,12 @@
 #include <vector>
 
 #include "ash/components/arc/arc_util.h"
-#include "ash/components/arc/usb/usb_host_bridge.h"
 #include "base/functional/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_dialog.h"
 #include "chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chromeos/ash/experiences/arc/usb/usb_host_bridge.h"
 #include "extensions/browser/api/device_permissions_manager.h"
 
 namespace arc {

chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.h

@@ -10,11 +10,11 @@
 #include <unordered_set>
 #include <vector>
 
-#include "ash/components/arc/usb/usb_host_ui_delegate.h"
 #include "base/functional/callback.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
+#include "chromeos/ash/experiences/arc/usb/usb_host_ui_delegate.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 class Profile;

chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager_factory.cc

@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager_factory.h"
 
-#include "ash/components/arc/usb/usb_host_bridge.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.h"
+#include "chromeos/ash/experiences/arc/usb/usb_host_bridge.h"
 #include "content/public/browser/browser_context.h"
 
 namespace arc {

chrome/browser/ash/app_list/arc/arc_vpn_provider_unittest.cc

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ash/app_list/arc/arc_vpn_provider_manager.h"
-
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "chrome/browser/ash/app_list/app_list_test_util.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_test.h"
+#include "chrome/browser/ash/app_list/arc/arc_vpn_provider_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 
 namespace app_list {
 

chrome/browser/ash/app_list/search/app_search_provider_test_base.cc

@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "ash/components/arc/mojom/app.mojom.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/functional/callback_helpers.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/run_loop.h"
@@ -28,6 +27,7 @@
 #include "chrome/browser/ash/app_list/test/test_app_list_controller_delegate.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/sync/model/string_ordinal.h"
 #include "extensions/common/extension_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/ash/app_list/search/app_search_provider_unittest.cc

@@ -11,7 +11,6 @@
 #include <string>
 #include <utility>
 
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "ash/constants/ash_features.h"
 #include "ash/public/cpp/app_list/internal_app_id_constants.h"
 #include "base/containers/contains.h"
@@ -35,6 +34,7 @@
 #include "chromeos/ash/components/dbus/cicerone/cicerone_client.h"
 #include "chromeos/ash/components/dbus/concierge/concierge_client.h"
 #include "chromeos/ash/components/dbus/seneschal/seneschal_client.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/crx_file/id_util.h"
 #include "components/services/app_service/public/cpp/app_types.h"
 #include "components/services/app_service/public/cpp/icon_types.h"

chrome/browser/ash/app_restore/app_restore_arc_test_helper.cc

@@ -5,8 +5,6 @@
 #include "chrome/browser/ash/app_restore/app_restore_arc_test_helper.h"
 
 #include "ash/components/arc/mojom/app.mojom.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
@@ -16,6 +14,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 
 namespace mojo {
 

chrome/browser/ash/app_restore/full_restore_policy_browsertest.cc

@@ -4,7 +4,6 @@
 
 #include <memory>
 
-#include "ash/components/arc/test/arc_util_test_support.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_observer.h"
@@ -19,6 +18,7 @@
 #include "chrome/browser/policy/policy_test_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
 #include "components/app_restore/features.h"
 #include "components/exo/wm_helper.h"
 #include "components/policy/policy_constants.h"

chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc

@@ -9,9 +9,6 @@
 #include <vector>
 
 #include "ash/components/arc/mojom/app.mojom.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "ash/public/cpp/shelf_model.h"
 #include "base/containers/contains.h"
 #include "base/functional/callback.h"
@@ -44,6 +41,9 @@
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "chrome/browser/web_applications/web_app_registrar.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/webapps/browser/installable/installable_metrics.h"
 #include "components/webapps/browser/uninstall_result_code.h"
 #include "components/webapps/common/web_app_id.h"

chrome/browser/ash/apps/apk_web_app_installer_unittest.cc

@@ -2,18 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/ash/apps/apk_web_app_installer.h"
+
 #include <memory>
 #include <utility>
 
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback_helpers.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ash/apps/apk_web_app_installer.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/webapps/browser/install_result_code.h"
 #include "components/webapps/common/web_app_id.h"
 #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"

chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge_browsertest.cc

@@ -9,8 +9,6 @@
 
 #include "ash/accessibility/ui/accessibility_focus_ring_controller_impl.h"
 #include "ash/accessibility/ui/accessibility_focus_ring_layer.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
 #include "ash/shell.h"
 #include "base/feature_list.h"
 #include "base/metrics/histogram_base.h"
@@ -23,6 +21,8 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
 #include "components/exo/buffer.h"
 #include "components/exo/client_controlled_accelerators.h"
 #include "components/exo/shell_surface.h"

chrome/browser/ash/arc/adbd/arc_adbd_monitor_bridge_unittest.cc

@@ -7,9 +7,6 @@
 #include <memory>
 
 #include "ash/components/arc/arc_util.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_adbd_monitor_instance.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/test/bind.h"
 #include "base/test/test_future.h"
 #include "chrome/browser/ash/arc/session/arc_session_manager.h"
@@ -23,6 +20,9 @@
 #include "chromeos/ash/components/dbus/upstart/fake_upstart_client.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_adbd_monitor_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/scoped_user_manager.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/ash/arc/arc_ui_availability_reporter_unittest.cc

@@ -4,10 +4,6 @@
 
 #include "chrome/browser/ash/arc/arc_ui_availability_reporter.h"
 
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_app_instance.h"
-#include "ash/components/arc/test/fake_intent_helper_host.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
@@ -16,6 +12,10 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_host.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc

@@ -11,9 +11,6 @@
 
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "ash/constants/ash_features.h"
 #include "ash/constants/ash_switches.h"
 #include "ash/webui/settings/public/constants/routes.mojom-forward.h"
@@ -64,6 +61,9 @@
 #include "chromeos/ash/experiences/arc/session/arc_data_remover.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/account_id/account_id.h"
 #include "components/account_manager_core/chromeos/account_manager_facade_factory.h"
 #include "components/policy/core/common/cloud/device_management_service.h"

chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc

@@ -2,23 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h"
+
 #include <memory>
 #include <string>
 
-#include "ash/components/arc/test/arc_util_test_support.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback.h"
 #include "base/run_loop.h"
 #include "base/test/bind.h"
 #include "chrome/browser/ash/arc/auth/arc_auth_service.h"
-#include "chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h"
 #include "chrome/browser/ash/arc/session/arc_session_manager.h"
 #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"

chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge_unittest.cc

@@ -10,8 +10,6 @@
 #include <vector>
 
 #include "ash/components/arc/mojom/bluetooth.mojom.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_bluetooth_instance.h"
 #include "base/functional/bind.h"
 #include "base/run_loop.h"
 #include "base/system/sys_info.h"
@@ -21,6 +19,8 @@
 #include "chrome/browser/ash/arc/bluetooth/arc_bluez_bridge.h"
 #include "chromeos/ash/experiences/arc/bluetooth/bluetooth_type_converters.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_bluetooth_instance.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "device/bluetooth/dbus/fake_bluetooth_adapter_client.h"

chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge_unittest.cc

@@ -7,8 +7,6 @@
 #include <memory>
 
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
 #include "base/memory/raw_ptr.h"
@@ -22,6 +20,8 @@
 #include "chromeos/ash/components/dbus/concierge/concierge_client.h"
 #include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "components/user_manager/scoped_user_manager.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service_unittest.cc

@@ -5,8 +5,6 @@
 #include "chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service.h"
 
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
 #include "base/memory/raw_ptr.h"
@@ -20,6 +18,8 @@
 #include "chrome/test/base/testing_profile_manager.h"
 #include "chromeos/ash/components/dbus/concierge/concierge_client.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/scoped_user_manager.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer_unittest.cc

@@ -8,8 +8,6 @@
 #include <vector>
 
 #include "ash/components/arc/mojom/policy.mojom.h"
-#include "ash/components/arc/test/fake_arc_session.h"
-#include "ash/components/arc/test/fake_policy_instance.h"
 #include "base/memory/raw_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
@@ -22,6 +20,8 @@
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
+#include "chromeos/ash/experiences/arc/test/fake_policy_instance.h"
 #include "components/policy/core/common/remote_commands/remote_commands_queue.h"
 #include "content/public/test/browser_task_environment.h"
 #include "crypto/rsa_private_key.h"

chrome/browser/ash/arc/enterprise/cert_store/cert_store_service_browsertest.cc

@@ -18,7 +18,6 @@
 
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
 #include "ash/constants/ash_switches.h"
 #include "base/base64.h"
 #include "base/command_line.h"
@@ -54,6 +53,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/components/network/network_cert_loader.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
 #include "components/policy/policy_constants.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_task_traits.h"

chrome/browser/ash/arc/error_notification/BUILD.gn

@@ -18,11 +18,11 @@ static_library("error_notification") {
 
   deps = [
     "//ash/components/arc",
-    "//ash/components/arc/vector_icons",
     "//ash/public/cpp",
     "//ash/resources/vector_icons",
     "//base",
     "//chrome/browser/profiles:profile",
+    "//chromeos/ash/experiences/arc/vector_icons",
     "//ui/message_center",
   ]
 }

chrome/browser/ash/arc/error_notification/arc_error_notification_bridge.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/ash/arc/error_notification/arc_error_notification_bridge.h"
 
 #include "ash/components/arc/arc_features.h"
-#include "ash/components/arc/vector_icons/vector_icons.h"
 #include "ash/public/cpp/notification_utils.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/memory/singleton.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
+#include "chromeos/ash/experiences/arc/vector_icons/vector_icons.h"
 #include "ui/message_center/public/cpp/notification.h"
 #include "ui/message_center/public/cpp/notification_delegate.h"
 #include "ui/message_center/public/cpp/notification_types.h"

chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.cc

@@ -54,7 +54,7 @@ constexpr base::FilePath::CharType kAndroidDownloadDir[] =
 // TODO(crbug.com/929031): Move this to arc_volume_mounter_bridge.h.
 // The MyFiles path inside ARC container. This will be the path that is used in
 // MediaScanner.scanFile request. UUID for the MyFiles volume is taken from
-// ash/components/arc/volume_mounter/arc_volume_mounter_bridge.cc.
+// chromeos/ash/experiences/arc/volume_mounter/arc_volume_mounter_bridge.cc.
 constexpr base::FilePath::CharType kAndroidMyFilesDir[] =
     FILE_PATH_LITERAL("/storage/0000000000000000000000000000CAFEF00D2019");
 

chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.h

@@ -11,12 +11,12 @@
 #include <vector>
 
 #include "ash/components/arc/mojom/file_system.mojom-forward.h"
-#include "ash/components/arc/volume_mounter/arc_volume_mounter_bridge.h"
 #include "base/functional/callback.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/ash/experiences/arc/session/connection_observer.h"
+#include "chromeos/ash/experiences/arc/volume_mounter/arc_volume_mounter_bridge.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 namespace base {

chrome/browser/ash/arc/file_system_watcher/file_system_scanner_unittest.cc

@@ -14,8 +14,6 @@
 #include <string>
 #include <vector>
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_file_system_instance.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ -28,6 +26,8 @@
 #include "chrome/test/base/testing_profile_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_file_system_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util_unittest.cc

@@ -9,8 +9,6 @@
 #include <memory>
 #include <string>
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_file_system_instance.h"
 #include "ash/constants/ash_switches.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
@@ -22,6 +20,8 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_file_system_instance.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "content/public/test/browser_task_environment.h"
 #include "storage/browser/file_system/file_system_url.h"

chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc

@@ -16,14 +16,14 @@
 #include <string_view>
 #include <utility>
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_file_system_instance.h"
 #include "base/functional/bind.h"
 #include "base/location.h"
 #include "chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_file_system_instance.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "content/public/test/browser_task_environment.h"
 #include "net/base/io_buffer.h"

chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer_unittest.cc

@@ -8,14 +8,14 @@
 #include <string>
 #include <utility>
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_file_system_instance.h"
 #include "base/functional/bind.h"
 #include "base/run_loop.h"
 #include "chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_file_system_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/io_buffer.h"

chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map_unittest.cc

@@ -6,8 +6,6 @@
 
 #include <memory>
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_file_system_instance.h"
 #include "base/functional/bind.h"
 #include "base/memory/raw_ptr.h"
 #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h"
@@ -16,6 +14,8 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_file_system_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/fileapi/arc_documents_provider_root_unittest.cc

@@ -9,8 +9,6 @@
 #include <utility>
 
 #include "ash/components/arc/mojom/file_system.mojom.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_file_system_instance.h"
 #include "base/files/file_path.h"
 #include "base/functional/bind.h"
 #include "base/run_loop.h"
@@ -19,6 +17,8 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_file_system_instance.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "content/public/test/browser_task_environment.h"
 #include "storage/browser/file_system/watcher_manager.h"

chrome/browser/ash/arc/fileapi/arc_file_system_bridge_unittest.cc

@@ -9,8 +9,6 @@
 
 #include "ash/components/arc/arc_util.h"
 #include "ash/components/arc/mojom/file_system.mojom.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_file_system_instance.h"
 #include "base/containers/flat_map.h"
 #include "base/files/file.h"
 #include "base/files/file_util.h"
@@ -44,6 +42,8 @@
 #include "chromeos/ash/components/dbus/virtual_file_provider/fake_virtual_file_provider_client.h"
 #include "chromeos/ash/components/dbus/virtual_file_provider/virtual_file_provider_client.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_file_system_instance.h"
 #include "components/user_manager/scoped_user_manager.h"
 #include "content/public/test/browser_task_environment.h"
 #include "content/public/test/test_utils.h"

chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_unittest.cc

@@ -9,14 +9,14 @@
 #include <string>
 
 #include "ash/components/arc/mojom/file_system.mojom.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_file_system_instance.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback_helpers.h"
 #include "base/run_loop.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_file_system_instance.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/ash/arc/idle_manager/arc_cpu_throttle_observer_unittest.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/ash/arc/idle_manager/arc_cpu_throttle_observer.h"
 
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/memory/raw_ptr.h"
 #include "base/test/bind.h"
 #include "chrome/browser/ash/arc/idle_manager/arc_throttle_test_observer.h"
@@ -17,6 +16,7 @@
 #include "chromeos/ash/experiences/arc/metrics/stability_metrics_manager.h"
 #include "chromeos/ash/experiences/arc/power/arc_power_bridge.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/ash/arc/idle_manager/arc_idle_manager_unittest.cc

@@ -10,9 +10,6 @@
 
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/mojom/power.mojom.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_power_instance.h"
-#include "ash/components/arc/window/arc_window_watcher.h"
 #include "base/memory/raw_ptr.h"
 #include "base/test/bind.h"
 #include "base/test/metrics/histogram_tester.h"
@@ -26,6 +23,9 @@
 #include "chromeos/ash/experiences/arc/power/arc_power_bridge.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_power_instance.h"
+#include "chromeos/ash/experiences/arc/window/arc_window_watcher.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/ash/arc/idle_manager/arc_window_observer.h

@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_ASH_ARC_IDLE_MANAGER_ARC_WINDOW_OBSERVER_H_
 #define CHROME_BROWSER_ASH_ARC_IDLE_MANAGER_ARC_WINDOW_OBSERVER_H_
 
-#include "ash/components/arc/window/arc_window_watcher.h"
 #include "base/scoped_observation.h"
 #include "chromeos/ash/components/throttle/throttle_observer.h"
+#include "chromeos/ash/experiences/arc/window/arc_window_watcher.h"
 
 namespace arc {
 

chrome/browser/ash/arc/idle_manager/arc_window_observer_unittest.cc

@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ash/arc/idle_manager/arc_window_observer.h"
 
-#include "ash/components/arc/window/arc_window_watcher.h"
 #include "chrome/browser/ash/arc/idle_manager/arc_throttle_test_observer.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/window/arc_window_watcher.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager_unittest.cc

@@ -8,7 +8,6 @@
 #include <memory>
 #include <vector>
 
-#include "ash/components/arc/test/fake_compatibility_mode_instance.h"
 #include "ash/public/cpp/arc_game_controls_flag.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/ash/arc/input_overlay/test/test_utils.h"
 #include "chrome/browser/ash/arc/input_overlay/util.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_compatibility_mode_instance.h"
 #include "components/ukm/test_ukm_recorder.h"
 #include "content/public/test/browser_task_environment.h"
 #include "services/metrics/public/cpp/ukm_builders.h"

chrome/browser/ash/arc/input_overlay/test/test_utils.cc

@@ -6,13 +6,13 @@
 
 #include <cstddef>
 
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "ash/public/cpp/window_properties.h"
 #include "base/test/task_environment.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_test.h"
 #include "chrome/browser/ash/arc/input_overlay/actions/action.h"
 #include "chrome/browser/ash/arc/input_overlay/arc_input_overlay_metrics.h"
 #include "chrome/browser/ash/arc/input_overlay/touch_injector.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "chromeos/strings/grit/chromeos_strings.h"
 #include "chromeos/ui/base/app_types.h"
 #include "chromeos/ui/base/window_properties.h"

chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer.h

@@ -8,13 +8,13 @@
 #include <set>
 #include <string>
 
-#include "ash/components/arc/window/arc_window_watcher.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observation.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_utils.h"
 #include "chromeos/ash/components/throttle/throttle_observer.h"
 #include "chromeos/ash/experiences/arc/app/arc_app_launch_notifier.h"
+#include "chromeos/ash/experiences/arc/window/arc_window_watcher.h"
 
 namespace content {
 class BrowserContext;

chrome/browser/ash/arc/instance_throttle/arc_app_launch_throttle_observer_unittest.cc

@@ -10,12 +10,12 @@
 
 #include "ash/components/arc/mojom/app.mojom.h"
 #include "ash/components/arc/mojom/compatibility_mode.mojom.h"
-#include "ash/components/arc/window/arc_window_watcher.h"
 #include "base/test/task_environment.h"
 #include "base/time/time.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ash/arc/idle_manager/arc_throttle_test_observer.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/window/arc_window_watcher.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/instance_throttle/arc_boot_phase_throttle_observer_unittest.cc

@@ -7,13 +7,6 @@
 #include <memory>
 
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_host.h"
-#include "ash/components/arc/test/fake_app_instance.h"
-#include "ash/components/arc/test/fake_arc_session.h"
-#include "ash/components/arc/test/fake_intent_helper_host.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
@@ -26,6 +19,13 @@
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_host.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_host.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "components/user_manager/scoped_user_manager.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/ash/arc/instance_throttle/arc_instance_throttle_unittest.cc

@@ -11,14 +11,6 @@
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_prefs.h"
 #include "ash/components/arc/mojom/power.mojom.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_host.h"
-#include "ash/components/arc/test/fake_app_instance.h"
-#include "ash/components/arc/test/fake_arc_session.h"
-#include "ash/components/arc/test/fake_intent_helper_host.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
-#include "ash/components/arc/test/fake_power_instance.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
 #include "base/memory/raw_ptr.h"
@@ -39,6 +31,14 @@
 #include "chromeos/ash/experiences/arc/power/arc_power_bridge.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_host.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_host.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_power_instance.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer_unittest.cc

@@ -5,8 +5,6 @@
 #include "chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer.h"
 
 #include "ash/components/arc/mojom/anr.mojom.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
 #include "chrome/browser/ash/arc/session/arc_session_manager.h"
@@ -15,6 +13,8 @@
 #include "chromeos/ash/components/dbus/concierge/concierge_client.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/ash/arc/instance_throttle/arc_provisioning_throttle_observer_unittest.cc

@@ -8,8 +8,6 @@
 
 #include "ash/components/arc/arc_prefs.h"
 #include "ash/components/arc/mojom/auth.mojom.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/command_line.h"
 #include "chrome/browser/ash/arc/session/arc_provisioning_result.h"
 #include "chrome/browser/ash/arc/session/arc_session_manager.h"
@@ -19,6 +17,8 @@
 #include "chromeos/ash/components/dbus/concierge/concierge_client.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/scoped_user_manager.h"

chrome/browser/ash/arc/intent_helper/arc_settings_service_browsertest.cc

@@ -10,10 +10,6 @@
 #include <vector>
 
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_backup_settings_instance.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
 #include "ash/constants/ash_features.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
@@ -36,6 +32,10 @@
 #include "chromeos/ash/components/network/proxy/proxy_config_handler.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_backup_settings_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "components/policy/core/common/policy_map.h"

chrome/browser/ash/arc/intent_helper/arc_settings_service_unittest.cc

@@ -8,14 +8,6 @@
 
 #include "ash/components/arc/arc_prefs.h"
 #include "ash/components/arc/arc_util.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_host.h"
-#include "ash/components/arc/test/fake_app_instance.h"
-#include "ash/components/arc/test/fake_arc_session.h"
-#include "ash/components/arc/test/fake_backup_settings_instance.h"
-#include "ash/components/arc/test/fake_intent_helper_host.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
 #include "ash/constants/ash_pref_names.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
@@ -35,6 +27,14 @@
 #include "chromeos/ash/experiences/arc/metrics/stability_metrics_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_host.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
+#include "chromeos/ash/experiences/arc/test/fake_backup_settings_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_host.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
 #include "chromeos/ash/services/network_config/public/cpp/cros_network_config_test_helper.h"
 #include "components/language/core/browser/pref_names.h"
 #include "components/live_caption/pref_names.h"

chrome/browser/ash/arc/intent_helper/custom_tab_session_impl_browsertest.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ash/arc/intent_helper/custom_tab_session_impl.h"
 
-#include "ash/components/arc/test/arc_util_test_support.h"
 #include "base/containers/contains.h"
 #include "base/memory/raw_ptr.h"
 #include "chrome/browser/ash/arc/arc_util.h"
@@ -14,6 +13,7 @@
 #include "chrome/browser/ui/test/test_browser_closed_waiter.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/ash/experiences/arc/intent_helper/custom_tab.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/test/shell_surface_builder.h"
 #include "components/exo/wm_helper.h"

chrome/browser/ash/arc/keymint/arc_keymint_bridge_unittest.cc

@@ -6,11 +6,11 @@
 
 #include <gmock/gmock.h>
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_keymint_instance.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_keymint_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/nearby_share/arc_nearby_share_bridge_unittest.cc

@@ -4,12 +4,12 @@
 
 #include "chrome/browser/ash/arc/nearby_share/arc_nearby_share_bridge.h"
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_nearby_share_instance.h"
 #include "base/memory/raw_ptr.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_nearby_share_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/nearby_share/nearby_share_session_impl_unittest.cc

@@ -8,7 +8,6 @@
 
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/mojom/nearby_share.mojom.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
 #include "ash/public/cpp/shelf_model.h"
 #include "base/command_line.h"
 #include "base/containers/flat_map.h"
@@ -22,6 +21,7 @@
 #include "chrome/browser/ui/ash/shelf/chrome_shelf_controller.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
 #include "chromeos/ui/base/app_types.h"
 #include "chromeos/ui/base/window_properties.h"
 #include "components/exo/shell_surface_util.h"

chrome/browser/ash/arc/notification/arc_management_transition_notification_unittest.cc

@@ -8,7 +8,6 @@
 #include <string>
 
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/memory/raw_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/app/vector_icons/vector_icons.h"
@@ -19,6 +18,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/metrics/arc_metrics_constants.h"
 #include "chromeos/ash/experiences/arc/session/arc_management_transition.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "chromeos/ui/vector_icons/vector_icons.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/ash/arc/notification/arc_provision_notification_service_unittest.cc

@@ -8,8 +8,6 @@
 #include <utility>
 
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/command_line.h"
 #include "base/functional/bind.h"
 #include "base/memory/raw_ptr.h"
@@ -27,6 +25,8 @@
 #include "chromeos/ash/experiences/arc/metrics/arc_metrics_service.h"
 #include "chromeos/ash/experiences/arc/metrics/stability_metrics_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"

chrome/browser/ash/arc/notification/arc_vm_data_migration_notifier_unittest.cc

@@ -7,7 +7,6 @@
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_prefs.h"
 #include "ash/components/arc/arc_util.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "ash/test/ash_test_base.h"
 #include "base/command_line.h"
 #include "base/memory/raw_ptr.h"
@@ -24,6 +23,7 @@
 #include "chromeos/ash/components/dbus/concierge/concierge_client.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
 #include "chromeos/ash/experiences/arc/session/arc_vm_data_migration_status.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/user_manager/scoped_user_manager.h"
 #include "content/public/test/browser_task_environment.h"
 #include "google_apis/gaia/gaia_id.h"

chrome/browser/ash/arc/pip/arc_pip_bridge_unittest.cc

@@ -4,11 +4,11 @@
 
 #include "chrome/browser/ash/arc/pip/arc_pip_bridge.h"
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_pip_instance.h"
 #include "chrome/browser/ash/arc/pip/arc_picture_in_picture_window_controller_impl.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_pip_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc

@@ -10,10 +10,6 @@
 
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_arc_session.h"
-#include "ash/components/arc/test/fake_policy_instance.h"
 #include "ash/constants/ash_switches.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback_helpers.h"
@@ -41,6 +37,10 @@
 #include "chromeos/ash/components/system/fake_statistics_provider.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
+#include "chromeos/ash/experiences/arc/test/fake_policy_instance.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/policy/core/common/mock_policy_service.h"

chrome/browser/ash/arc/privacy_items/arc_privacy_items_bridge_unittest.cc

@@ -4,10 +4,10 @@
 
 #include "chrome/browser/ash/arc/privacy_items/arc_privacy_items_bridge.h"
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_privacy_items_instance.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_privacy_items_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/session/arc_activation_necessity_checker_unittest.cc

@@ -9,9 +9,6 @@
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_prefs.h"
 #include "ash/components/arc/mojom/app.mojom.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_app_instance.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "ash/constants/ash_switches.h"
 #include "base/command_line.h"
 #include "base/test/metrics/histogram_tester.h"
@@ -27,6 +24,9 @@
 #include "chromeos/ash/experiences/arc/session/adb_sideloading_availability_delegate.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/scoped_user_manager.h"

chrome/browser/ash/arc/session/arc_disk_space_monitor_unittest.cc

@@ -7,8 +7,6 @@
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_prefs.h"
 #include "ash/components/arc/arc_util.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/logging.h"
 #include "base/test/scoped_feature_list.h"
 #include "chrome/browser/ash/arc/session/arc_session_manager.h"
@@ -20,6 +18,8 @@
 #include "chromeos/ash/components/dbus/spaced/fake_spaced_client.h"
 #include "chromeos/ash/components/dbus/spaced/spaced_client.h"
 #include "chromeos/ash/components/install_attributes/stub_install_attributes.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/scoped_user_manager.h"
 #include "components/user_manager/user_manager.h"

chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler_unittest.cc

@@ -8,8 +8,6 @@
 #include <string>
 
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/functional/bind.h"
@@ -31,6 +29,8 @@
 #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
 #include "chromeos/ash/components/dbus/upstart/upstart_client.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/consent_auditor/fake_consent_auditor.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/signin/public/base/consent_level.h"

chrome/browser/ash/arc/session/arc_service_launcher.cc

@@ -9,10 +9,6 @@
 
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_util.h"
-#include "ash/components/arc/timer/arc_timer_bridge.h"
-#include "ash/components/arc/usb/usb_host_bridge.h"
-#include "ash/components/arc/volume_mounter/arc_volume_mounter_bridge.h"
-#include "ash/components/arc/wake_lock/arc_wake_lock_bridge.h"
 #include "ash/constants/ash_features.h"
 #include "base/check_op.h"
 #include "base/files/file_util.h"
@@ -107,6 +103,10 @@
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
 #include "chromeos/ash/experiences/arc/system_ui/arc_system_ui_bridge.h"
 #include "chromeos/ash/experiences/arc/video/gpu_arc_video_service_host.h"
+#include "chromeos/ash/experiences/arc/timer/arc_timer_bridge.h"
+#include "chromeos/ash/experiences/arc/usb/usb_host_bridge.h"
+#include "chromeos/ash/experiences/arc/volume_mounter/arc_volume_mounter_bridge.h"
+#include "chromeos/ash/experiences/arc/wake_lock/arc_wake_lock_bridge.h"
 #include "components/prefs/pref_member.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 

chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc

@@ -8,8 +8,6 @@
 #include <string>
 
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ -40,6 +38,8 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/account_id/account_id.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"

chrome/browser/ash/arc/session/arc_session_manager_unittest.cc

@@ -13,9 +13,6 @@
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_prefs.h"
 #include "ash/components/arc/arc_util.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/fake_arc_dlc_install_notification_delegate.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "ash/constants/ash_features.h"
 #include "ash/constants/ash_switches.h"
 #include "base/check_op.h"
@@ -73,6 +70,9 @@
 #include "chromeos/ash/experiences/arc/dlc_install_notification/arc_dlc_install_notification_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_session_runner.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_dlc_install_notification_delegate.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "components/account_id/account_id.h"
 #include "components/policy/proto/chrome_device_policy.pb.h"

chrome/browser/ash/arc/sharesheet/arc_sharesheet_bridge_unittest.cc

@@ -4,12 +4,12 @@
 
 #include "chrome/browser/ash/arc/sharesheet/arc_sharesheet_bridge.h"
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_sharesheet_instance.h"
 #include "base/memory/raw_ptr.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_sharesheet_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/tracing/arc_app_performance_tracing_unittest.cc

@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "ash/components/arc/test/arc_task_window_builder.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/desks/desks_util.h"
@@ -25,6 +24,7 @@
 #include "chrome/browser/sync/sync_service_factory.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/arc_task_window_builder.h"
 #include "components/app_restore/app_restore_data.h"
 #include "components/exo/shell_surface_util.h"
 #include "components/exo/surface.h"

chrome/browser/ash/arc/tracing/arc_tracing_bridge_unittest.cc

@@ -6,8 +6,6 @@
 
 #include <memory>
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_tracing_instance.h"
 #include "base/functional/bind.h"
 #include "base/memory/raw_ptr.h"
 #include "base/test/trace_test_utils.h"
@@ -15,6 +13,8 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_tracing_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/tracing/overview_tracing_handler_unittest.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/ash/arc/tracing/overview_tracing_handler.h"
 
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/arc/test/arc_task_window_builder.h"
 #include "ash/constants/ash_switches.h"
 #include "base/test/test_file_util.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_test.h"
@@ -15,6 +14,7 @@
 #include "chrome/test/base/chrome_ash_test_base.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/arc_task_window_builder.h"
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 
 namespace arc {

chrome/browser/ash/arc/tts/arc_tts_service_unittest.cc

@@ -6,13 +6,13 @@
 
 #include <memory>
 
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/memory/raw_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/browser/speech/tts_chromeos.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "content/public/browser/tts_controller.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/ash/arc/user_session/arc_user_session_service_browsertest.cc

@@ -6,15 +6,15 @@
 
 #include <memory>
 
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
 #include "base/run_loop.h"
 #include "base/task/current_thread.h"
 #include "chrome/browser/ui/ash/shelf/chrome_shelf_prefs.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
 #include "components/session_manager/core/session_manager.h"
 #include "content/public/test/browser_test.h"
 

chrome/browser/ash/arc/user_session/arc_user_session_service_unittest.cc

@@ -4,12 +4,12 @@
 
 #include "chrome/browser/ash/arc/user_session/arc_user_session_service.h"
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_intent_helper_host.h"
-#include "ash/components/arc/test/fake_intent_helper_instance.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_host.h"
+#include "chromeos/ash/experiences/arc/test/fake_intent_helper_instance.h"
 #include "components/session_manager/core/session_manager.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/ash/arc/vmm/arc_system_state_bridge_unittest.cc

@@ -4,12 +4,12 @@
 
 #include "chrome/browser/ash/arc/vmm/arc_system_state_bridge.h"
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_system_state_instance.h"
 #include "base/memory/raw_ptr.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_system_state_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/vmm/arc_system_state_observation_unittest.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ash/arc/vmm/arc_system_state_observation.h"
 
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/memory/raw_ptr.h"
 #include "base/test/bind.h"
 #include "chrome/browser/ash/app_list/arc/arc_app_test.h"
@@ -17,6 +16,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/ash/experiences/arc/app/arc_app_constants.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/vmm/arc_vmm_manager_browsertest.cc

@@ -6,9 +6,6 @@
 
 #include "ash/accelerators/accelerator_controller_impl.h"
 #include "ash/components/arc/arc_features.h"
-#include "ash/components/arc/test/arc_util_test_support.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "ash/constants/ash_switches.h"
 #include "base/run_loop.h"
 #include "base/task/current_thread.h"
@@ -21,6 +18,9 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/arc_util_test_support.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "content/public/test/browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/ash/arc/vmm/arcvm_working_set_trim_executor_unittest.cc

@@ -6,8 +6,6 @@
 
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/mojom/memory.mojom.h"
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_arc_session.h"
 #include "base/test/bind.h"
 #include "base/test/task_environment.h"
 #include "base/timer/timer.h"
@@ -18,6 +16,8 @@
 #include "chromeos/ash/experiences/arc/memory/arc_memory_bridge.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_arc_session.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc

@@ -10,8 +10,6 @@
 #include <string>
 #include <utility>
 
-#include "ash/components/arc/test/connection_holder_util.h"
-#include "ash/components/arc/test/fake_wallpaper_instance.h"
 #include "ash/constants/ash_pref_names.h"
 #include "base/functional/bind.h"
 #include "base/memory/ptr_util.h"
@@ -28,6 +26,8 @@
 #include "chromeos/ash/components/cryptohome/system_salt_getter.h"
 #include "chromeos/ash/experiences/arc/session/arc_bridge_service.h"
 #include "chromeos/ash/experiences/arc/session/arc_service_manager.h"
+#include "chromeos/ash/experiences/arc/test/connection_holder_util.h"
+#include "chromeos/ash/experiences/arc/test/fake_wallpaper_instance.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/user_manager/scoped_user_manager.h"

chrome/browser/ash/child_accounts/family_user_parental_control_metrics_unittest.cc

@@ -7,7 +7,6 @@
 #include <memory>
 #include <string>
 
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/containers/flat_map.h"
 #include "base/run_loop.h"
 #include "base/strings/strcat.h"
@@ -30,6 +29,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/services/app_service/public/cpp/app_types.h"
 #include "components/sync_preferences/pref_service_syncable.h"

chrome/browser/ash/child_accounts/on_device_controls/app_controls_test_base.cc

@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "ash/components/arc/mojom/app.mojom.h"
-#include "ash/components/arc/test/fake_app_instance.h"
 #include "base/command_line.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
 #include "chrome/browser/apps/app_service/app_service_test.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/ash/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ash/child_accounts/apps/app_test_utils.h"
 #include "chrome/common/chrome_switches.h"
+#include "chromeos/ash/experiences/arc/test/fake_app_instance.h"
 #include "content/public/test/browser_task_environment.h"
 
 namespace ash::on_device_controls {