Move //chrome/browser/{chromeos => ash}/drive

This CL is part of the Chrome OS source code directory migration: https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE. Bug: 1164001 Change-Id: I5ce66689b94fd3c6686c8d13606af61d8cb7355f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2784419 Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> Owners-Override: Hidehiko Abe <hidehiko@chromium.org> Commit-Queue: Yeunjoo Choi <ychoi@igalia.com> Cr-Commit-Position: refs/heads/master@{#867191}
marcosholgado · Mar 29, 2021 · f23b136 · f23b136
1 parent 7ec6250
commit f23b136
Show file tree

Hide file tree

Showing 73 changed files with 122 additions and 122 deletions.
diff --git a/WATCHLISTS b/WATCHLISTS
@@ -1023,7 +1023,7 @@
                   'filebrowse'
     },
     'filesapp': {
-      'filepath': 'chrome/browser/chromeos/drive|' \
+      'filepath': 'chrome/browser/ash/drive|' \
                   'chrome/browser/chromeos/extensions/file_manager|' \
                   'chrome/browser/chromeos/extensions/file_system_provider|' \
                   'chrome/browser/chromeos/file_manager|' \

diff --git a/chrome/browser/ash/arc/fileapi/arc_file_system_bridge.cc b/chrome/browser/ash/arc/fileapi/arc_file_system_bridge.cc
@@ -23,8 +23,8 @@
 #include "chrome/browser/ash/arc/fileapi/arc_select_files_handler.h"
 #include "chrome/browser/ash/arc/fileapi/chrome_content_provider_url_util.h"
 #include "chrome/browser/ash/arc/fileapi/file_stream_forwarder.h"
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/drive/file_system_util.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
+#include "chrome/browser/ash/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"

diff --git a/chrome/browser/chromeos/drive/DEPS → chrome/browser/ash/drive/DEPS b/chrome/browser/chromeos/drive/DEPS → chrome/browser/ash/drive/DEPS
diff --git a/chrome/browser/chromeos/drive/OWNERS → chrome/browser/ash/drive/OWNERS b/chrome/browser/chromeos/drive/OWNERS → chrome/browser/ash/drive/OWNERS
diff --git a/...romeos/drive/drive_integration_service.cc → ...er/ash/drive/drive_integration_service.cc b/...romeos/drive/drive_integration_service.cc → ...er/ash/drive/drive_integration_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
 
 #include <memory>
 #include <set>
@@ -26,10 +26,10 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "base/unguessable_token.h"
+#include "chrome/browser/ash/drive/drivefs_native_message_host.h"
+#include "chrome/browser/ash/drive/file_system_util.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/drive/drivefs_native_message_host.h"
-#include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/download/download_core_service_factory.h"
 #include "chrome/browser/download/download_prefs.h"

diff --git a/...hromeos/drive/drive_integration_service.h → ...ser/ash/drive/drive_integration_service.h b/...hromeos/drive/drive_integration_service.h → ...ser/ash/drive/drive_integration_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_INTEGRATION_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_INTEGRATION_SERVICE_H_
+#ifndef CHROME_BROWSER_ASH_DRIVE_DRIVE_INTEGRATION_SERVICE_H_
+#define CHROME_BROWSER_ASH_DRIVE_DRIVE_INTEGRATION_SERVICE_H_
 
 #include <memory>
 #include <set>
@@ -381,4 +381,4 @@ class DriveIntegrationServiceFactory
 
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_INTEGRATION_SERVICE_H_
+#endif  // CHROME_BROWSER_ASH_DRIVE_DRIVE_INTEGRATION_SERVICE_H_
diff --git a/.../drive_integration_service_browsertest.cc → .../drive_integration_service_browsertest.cc b/.../drive_integration_service_browsertest.cc → .../drive_integration_service_browsertest.cc
@@ -2,15 +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/chromeos/drive/drive_integration_service.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
 
 #include "ash/constants/ash_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/test/bind.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/chromeos/drive/drivefs_test_support.h"
+#include "chrome/browser/ash/drive/drivefs_test_support.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"

diff --git a/...ive/drive_integration_service_unittest.cc → ...ive/drive_integration_service_unittest.cc b/...ive/drive_integration_service_unittest.cc → ...ive/drive_integration_service_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
 
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"

diff --git a/...meos/drive/drivefs_native_message_host.cc → .../ash/drive/drivefs_native_message_host.cc b/...meos/drive/drivefs_native_message_host.cc → .../ash/drive/drivefs_native_message_host.cc
@@ -2,15 +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/chromeos/drive/drivefs_native_message_host.h"
+#include "chrome/browser/ash/drive/drivefs_native_message_host.h"
 
 #include "ash/constants/ash_features.h"
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
 #include "chrome/browser/extensions/api/messaging/native_message_port.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_constants.h"

diff --git a/...omeos/drive/drivefs_native_message_host.h → ...r/ash/drive/drivefs_native_message_host.h b/...omeos/drive/drivefs_native_message_host.h → ...r/ash/drive/drivefs_native_message_host.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVEFS_NATIVE_MESSAGE_HOST_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVEFS_NATIVE_MESSAGE_HOST_H_
+#ifndef CHROME_BROWSER_ASH_DRIVE_DRIVEFS_NATIVE_MESSAGE_HOST_H_
+#define CHROME_BROWSER_ASH_DRIVE_DRIVEFS_NATIVE_MESSAGE_HOST_H_
 
 #include <memory>
 
@@ -45,4 +45,4 @@ ConnectToDriveFsNativeMessageExtension(
 
 }  // namespace drive
 
-#endif  //  CHROME_BROWSER_CHROMEOS_DRIVE_DRIVEFS_NATIVE_MESSAGE_HOST_H_
+#endif  //  CHROME_BROWSER_ASH_DRIVE_DRIVEFS_NATIVE_MESSAGE_HOST_H_
diff --git a/...e/drivefs_native_message_host_unittest.cc → ...e/drivefs_native_message_host_unittest.cc b/...e/drivefs_native_message_host_unittest.cc → ...e/drivefs_native_message_host_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/drivefs_native_message_host.h"
+#include "chrome/browser/ash/drive/drivefs_native_message_host.h"
 
 #include <memory>
 

diff --git a/...er/chromeos/drive/drivefs_test_support.cc → ...browser/ash/drive/drivefs_test_support.cc b/...er/chromeos/drive/drivefs_test_support.cc → ...browser/ash/drive/drivefs_test_support.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/drivefs_test_support.h"
+#include "chrome/browser/ash/drive/drivefs_test_support.h"
 
 #include <string>
 #include <utility>

diff --git a/...ser/chromeos/drive/drivefs_test_support.h → .../browser/ash/drive/drivefs_test_support.h b/...ser/chromeos/drive/drivefs_test_support.h → .../browser/ash/drive/drivefs_test_support.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVEFS_TEST_SUPPORT_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVEFS_TEST_SUPPORT_H_
+#ifndef CHROME_BROWSER_ASH_DRIVE_DRIVEFS_TEST_SUPPORT_H_
+#define CHROME_BROWSER_ASH_DRIVE_DRIVEFS_TEST_SUPPORT_H_
 
 #include <memory>
 
@@ -40,4 +40,4 @@ class FakeDriveFsHelper {
 
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVEFS_TEST_SUPPORT_H_
+#endif  // CHROME_BROWSER_ASH_DRIVE_DRIVEFS_TEST_SUPPORT_H_
diff --git a/...rowser/chromeos/drive/file_system_util.cc → chrome/browser/ash/drive/file_system_util.cc b/...rowser/chromeos/drive/file_system_util.cc → chrome/browser/ash/drive/file_system_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system_util.h"
+#include "chrome/browser/ash/drive/file_system_util.h"
 
 #include <stddef.h>
 
@@ -16,8 +16,8 @@
 #include "base/check_op.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chromeos/login/login_state/login_state.h"

diff --git a/...browser/chromeos/drive/file_system_util.h → chrome/browser/ash/drive/file_system_util.h b/...browser/chromeos/drive/file_system_util.h → chrome/browser/ash/drive/file_system_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_UTIL_H_
+#ifndef CHROME_BROWSER_ASH_DRIVE_FILE_SYSTEM_UTIL_H_
+#define CHROME_BROWSER_ASH_DRIVE_FILE_SYSTEM_UTIL_H_
 
 #include <string>
 
@@ -59,4 +59,4 @@ ConnectionStatusType GetDriveConnectionStatus(Profile* profile);
 }  // namespace util
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_UTIL_H_
+#endif  // CHROME_BROWSER_ASH_DRIVE_FILE_SYSTEM_UTIL_H_
diff --git a/...romeos/drive/file_system_util_unittest.cc → ...er/ash/drive/file_system_util_unittest.cc b/...romeos/drive/file_system_util_unittest.cc → ...er/ash/drive/file_system_util_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system_util.h"
+#include "chrome/browser/ash/drive/file_system_util.h"
 
 #include "base/files/file_path.h"
 #include "chrome/test/base/testing_profile.h"

diff --git a/.../drive/fileapi/drivefs_async_file_util.cc → .../drive/fileapi/drivefs_async_file_util.cc b/.../drive/fileapi/drivefs_async_file_util.cc → .../drive/fileapi/drivefs_async_file_util.cc
@@ -2,15 +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/chromeos/drive/fileapi/drivefs_async_file_util.h"
+#include "chrome/browser/ash/drive/fileapi/drivefs_async_file_util.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/drive/file_system_util.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
+#include "chrome/browser/ash/drive/file_system_util.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/bindings/callback_helpers.h"

diff --git a/...s/drive/fileapi/drivefs_async_file_util.h → ...h/drive/fileapi/drivefs_async_file_util.h b/...s/drive/fileapi/drivefs_async_file_util.h → ...h/drive/fileapi/drivefs_async_file_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_DRIVEFS_ASYNC_FILE_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_DRIVEFS_ASYNC_FILE_UTIL_H_
+#ifndef CHROME_BROWSER_ASH_DRIVE_FILEAPI_DRIVEFS_ASYNC_FILE_UTIL_H_
+#define CHROME_BROWSER_ASH_DRIVE_FILEAPI_DRIVEFS_ASYNC_FILE_UTIL_H_
 
 #include <memory>
 
@@ -47,4 +47,4 @@ class DriveFsAsyncFileUtil : public storage::AsyncFileUtilAdapter {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_DRIVEFS_ASYNC_FILE_UTIL_H_
+#endif  // CHROME_BROWSER_ASH_DRIVE_FILEAPI_DRIVEFS_ASYNC_FILE_UTIL_H_
diff --git a/...i/drivefs_file_system_backend_delegate.cc → ...i/drivefs_file_system_backend_delegate.cc b/...i/drivefs_file_system_backend_delegate.cc → ...i/drivefs_file_system_backend_delegate.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/fileapi/drivefs_file_system_backend_delegate.h"
+#include "chrome/browser/ash/drive/fileapi/drivefs_file_system_backend_delegate.h"
 
-#include "chrome/browser/chromeos/drive/fileapi/drivefs_async_file_util.h"
+#include "chrome/browser/ash/drive/fileapi/drivefs_async_file_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "storage/browser/file_system/async_file_util.h"
 #include "storage/browser/file_system/file_stream_reader.h"

diff --git a/...pi/drivefs_file_system_backend_delegate.h → ...pi/drivefs_file_system_backend_delegate.h b/...pi/drivefs_file_system_backend_delegate.h → ...pi/drivefs_file_system_backend_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_DRIVEFS_FILE_SYSTEM_BACKEND_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_DRIVEFS_FILE_SYSTEM_BACKEND_DELEGATE_H_
+#ifndef CHROME_BROWSER_ASH_DRIVE_FILEAPI_DRIVEFS_FILE_SYSTEM_BACKEND_DELEGATE_H_
+#define CHROME_BROWSER_ASH_DRIVE_FILEAPI_DRIVEFS_FILE_SYSTEM_BACKEND_DELEGATE_H_
 
 #include <stdint.h>
 
@@ -59,4 +59,4 @@ class DriveFsFileSystemBackendDelegate
 
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_DRIVEFS_FILE_SYSTEM_BACKEND_DELEGATE_H_
+#endif  // CHROME_BROWSER_ASH_DRIVE_FILEAPI_DRIVEFS_FILE_SYSTEM_BACKEND_DELEGATE_H_
diff --git a/chrome/browser/ash/scanning/chrome_scanning_app_delegate.cc b/chrome/browser/ash/scanning/chrome_scanning_app_delegate.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/apps/app_service/launch_utils.h"
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"

diff --git a/chrome/browser/ash/scanning/scan_service_factory.cc b/chrome/browser/ash/scanning/scan_service_factory.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/ash/scanning/scan_service_factory.h"
 
 #include "base/memory/singleton.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/ash/scanning/lorgnette_scanner_manager_factory.h"
 #include "chrome/browser/ash/scanning/scan_service.h"
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
@@ -410,6 +410,7 @@
 #include "chrome/app/chrome_crash_reporter_client.h"
 #include "chrome/browser/ash/arc/fileapi/arc_content_file_system_backend_delegate.h"
 #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_backend_delegate.h"
+#include "chrome/browser/ash/drive/fileapi/drivefs_file_system_backend_delegate.h"
 #include "chrome/browser/ash/login/signin/merge_session_navigation_throttle.h"
 #include "chrome/browser/ash/login/signin/merge_session_throttling_utils.h"
 #include "chrome/browser/ash/login/signin_partition_manager.h"
@@ -420,7 +421,6 @@
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 #include "chrome/browser/chromeos/chrome_content_browser_client_chromeos_part.h"
-#include "chrome/browser/chromeos/drive/fileapi/drivefs_file_system_backend_delegate.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h"
 #include "chrome/browser/chromeos/fileapi/external_file_url_loader_factory.h"

diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
@@ -1021,6 +1021,16 @@ source_set("chromeos") {
     "../ash/crosapi/video_frame_handler_ash.h",
     "../ash/crosapi/window_util.cc",
     "../ash/crosapi/window_util.h",
+    "../ash/drive/drive_integration_service.cc",
+    "../ash/drive/drive_integration_service.h",
+    "../ash/drive/drivefs_native_message_host.cc",
+    "../ash/drive/drivefs_native_message_host.h",
+    "../ash/drive/file_system_util.cc",
+    "../ash/drive/file_system_util.h",
+    "../ash/drive/fileapi/drivefs_async_file_util.cc",
+    "../ash/drive/fileapi/drivefs_async_file_util.h",
+    "../ash/drive/fileapi/drivefs_file_system_backend_delegate.cc",
+    "../ash/drive/fileapi/drivefs_file_system_backend_delegate.h",
     "../ash/lock_screen_apps/app_manager.h",
     "../ash/lock_screen_apps/app_manager_impl.cc",
     "../ash/lock_screen_apps/app_manager_impl.h",
@@ -1892,16 +1902,6 @@ source_set("chromeos") {
     "device_sync/device_sync_client_factory.h",
     "display/quirks_manager_delegate_impl.cc",
     "display/quirks_manager_delegate_impl.h",
-    "drive/drive_integration_service.cc",
-    "drive/drive_integration_service.h",
-    "drive/drivefs_native_message_host.cc",
-    "drive/drivefs_native_message_host.h",
-    "drive/file_system_util.cc",
-    "drive/file_system_util.h",
-    "drive/fileapi/drivefs_async_file_util.cc",
-    "drive/fileapi/drivefs_async_file_util.h",
-    "drive/fileapi/drivefs_file_system_backend_delegate.cc",
-    "drive/fileapi/drivefs_file_system_backend_delegate.h",
     "eche_app/eche_app_manager_factory.cc",
     "eche_app/eche_app_manager_factory.h",
     "eol_notification.cc",
@@ -3349,6 +3349,8 @@ static_library("test_support") {
     "../ash/cert_provisioning/mock_cert_provisioning_scheduler.h",
     "../ash/certificate_provider/test_certificate_provider_extension.cc",
     "../ash/certificate_provider/test_certificate_provider_extension.h",
+    "../ash/drive/drivefs_test_support.cc",
+    "../ash/drive/drivefs_test_support.h",
     "../ash/lock_screen_apps/fake_lock_screen_profile_creator.cc",
     "../ash/lock_screen_apps/fake_lock_screen_profile_creator.h",
     "../ash/login/demo_mode/demo_mode_test_helper.cc",
@@ -3430,8 +3432,6 @@ static_library("test_support") {
     "crostini/crostini_test_util.h",
     "crostini/fake_crostini_features.cc",
     "crostini/fake_crostini_features.h",
-    "drive/drivefs_test_support.cc",
-    "drive/drivefs_test_support.h",
     "extensions/test_external_cache.cc",
     "extensions/test_external_cache.h",
     "file_manager/mount_test_util.cc",
@@ -3641,6 +3641,9 @@ source_set("unit_tests") {
     "../ash/crosapi/metrics_reporting_ash_unittest.cc",
     "../ash/crosapi/prefs_ash_unittest.cc",
     "../ash/crosapi/test_mojo_connection_manager_unittest.cc",
+    "../ash/drive/drive_integration_service_unittest.cc",
+    "../ash/drive/drivefs_native_message_host_unittest.cc",
+    "../ash/drive/file_system_util_unittest.cc",
     "../ash/lock_screen_apps/app_manager_impl_unittest.cc",
     "../ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc",
     "../ash/lock_screen_apps/state_controller_unittest.cc",
@@ -3805,9 +3808,6 @@ source_set("unit_tests") {
     "dbus/encrypted_reporting_service_provider_unittest.cc",
     "dbus/proxy_resolution_service_provider_unittest.cc",
     "device_name_store_unittest.cc",
-    "drive/drive_integration_service_unittest.cc",
-    "drive/drivefs_native_message_host_unittest.cc",
-    "drive/file_system_util_unittest.cc",
     "eol_notification_unittest.cc",
     "events/event_rewriter_unittest.cc",
     "exo/chrome_data_exchange_delegate_unittest.cc",

diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
@@ -19,12 +19,12 @@
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/ash/arc/arc_util.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
+#include "chrome/browser/ash/drive/file_system_util.h"
 #include "chrome/browser/ash/login/lock/screen_locker.h"
 #include "chrome/browser/ash/login/ui/login_display_host.h"
 #include "chrome/browser/ash/plugin_vm/plugin_vm_util.h"
 #include "chrome/browser/chromeos/crostini/crostini_pref_names.h"
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"

diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h
@@ -16,7 +16,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/optional.h"
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
+#include "chrome/browser/ash/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/extensions/file_manager/device_event_router.h"
 #include "chrome/browser/chromeos/extensions/file_manager/drivefs_event_router.h"
 #include "chrome/browser/chromeos/file_manager/file_watcher.h"