Move CRD remote command code in its own subdirectory
Bug: N/A
Change-Id: Ic2314e9d567a17186eb7739b8b4d5ff92f2509ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4968456
Reviewed-by: Dominic Battre <[email protected]>
Reviewed-by: Artem Sumaneev <[email protected]>
Reviewed-by: Alexander Hendrich <[email protected]>
Auto-Submit: Jeroen Dhollander <[email protected]>
Commit-Queue: Alexander Hendrich <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1234955}
diff --git a/chrome/browser/ash/BUILD.gn b/chrome/browser/ash/BUILD.gn
index 32f1480..c3ffad2 100644
--- a/chrome/browser/ash/BUILD.gn
+++ b/chrome/browser/ash/BUILD.gn
@@ -2593,20 +2593,26 @@
"policy/off_hours/off_hours_proto_parser.h",
"policy/remote_commands/affiliated_remote_commands_invalidator.cc",
"policy/remote_commands/affiliated_remote_commands_invalidator.h",
- "policy/remote_commands/crd_admin_session_controller.cc",
- "policy/remote_commands/crd_admin_session_controller.h",
- "policy/remote_commands/crd_logging.h",
- "policy/remote_commands/crd_oauth_token_fetcher.cc",
- "policy/remote_commands/crd_oauth_token_fetcher.h",
- "policy/remote_commands/crd_remote_command_utils.cc",
- "policy/remote_commands/crd_remote_command_utils.h",
- "policy/remote_commands/crd_session_observer.h",
- "policy/remote_commands/crd_support_host_observer_proxy.cc",
- "policy/remote_commands/crd_support_host_observer_proxy.h",
- "policy/remote_commands/crd_uma_logger.cc",
- "policy/remote_commands/crd_uma_logger.h",
- "policy/remote_commands/device_command_fetch_crd_availability_info_job.cc",
- "policy/remote_commands/device_command_fetch_crd_availability_info_job.h",
+ "policy/remote_commands/crd/crd_admin_session_controller.cc",
+ "policy/remote_commands/crd/crd_admin_session_controller.h",
+ "policy/remote_commands/crd/crd_logging.h",
+ "policy/remote_commands/crd/crd_oauth_token_fetcher.cc",
+ "policy/remote_commands/crd/crd_oauth_token_fetcher.h",
+ "policy/remote_commands/crd/crd_remote_command_utils.cc",
+ "policy/remote_commands/crd/crd_remote_command_utils.h",
+ "policy/remote_commands/crd/crd_session_observer.h",
+ "policy/remote_commands/crd/crd_support_host_observer_proxy.cc",
+ "policy/remote_commands/crd/crd_support_host_observer_proxy.h",
+ "policy/remote_commands/crd/crd_uma_logger.cc",
+ "policy/remote_commands/crd/crd_uma_logger.h",
+ "policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.cc",
+ "policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.h",
+ "policy/remote_commands/crd/device_command_start_crd_session_job.cc",
+ "policy/remote_commands/crd/device_command_start_crd_session_job.h",
+ "policy/remote_commands/crd/remote_activity_notification_controller.cc",
+ "policy/remote_commands/crd/remote_activity_notification_controller.h",
+ "policy/remote_commands/crd/start_crd_session_job_delegate.cc",
+ "policy/remote_commands/crd/start_crd_session_job_delegate.h",
"policy/remote_commands/device_command_fetch_status_job.cc",
"policy/remote_commands/device_command_fetch_status_job.h",
"policy/remote_commands/device_command_fetch_support_packet_job.cc",
@@ -2629,20 +2635,14 @@
"policy/remote_commands/device_command_screenshot_job.h",
"policy/remote_commands/device_command_set_volume_job.cc",
"policy/remote_commands/device_command_set_volume_job.h",
- "policy/remote_commands/device_command_start_crd_session_job.cc",
- "policy/remote_commands/device_command_start_crd_session_job.h",
"policy/remote_commands/device_command_wipe_users_job.cc",
"policy/remote_commands/device_command_wipe_users_job.h",
"policy/remote_commands/device_commands_factory_ash.cc",
"policy/remote_commands/device_commands_factory_ash.h",
"policy/remote_commands/fake_screenshot_delegate.cc",
"policy/remote_commands/fake_screenshot_delegate.h",
- "policy/remote_commands/remote_activity_notification_controller.cc",
- "policy/remote_commands/remote_activity_notification_controller.h",
"policy/remote_commands/screenshot_delegate.cc",
"policy/remote_commands/screenshot_delegate.h",
- "policy/remote_commands/start_crd_session_job_delegate.cc",
- "policy/remote_commands/start_crd_session_job_delegate.h",
"policy/remote_commands/user_command_arc_job.cc",
"policy/remote_commands/user_command_arc_job.h",
"policy/remote_commands/user_commands_factory_ash.cc",
@@ -4782,8 +4782,8 @@
"policy/handlers/minimum_version_policy_test_helpers.h",
"policy/login/signin_profile_extensions_policy_test_base.cc",
"policy/login/signin_profile_extensions_policy_test_base.h",
- "policy/remote_commands/fake_start_crd_session_job_delegate.cc",
- "policy/remote_commands/fake_start_crd_session_job_delegate.h",
+ "policy/remote_commands/crd/fake_start_crd_session_job_delegate.cc",
+ "policy/remote_commands/crd/fake_start_crd_session_job_delegate.h",
"policy/reporting/metrics_reporting/cros_healthd_info_metric_sampler_test_utils.cc",
"policy/reporting/metrics_reporting/cros_healthd_info_metric_sampler_test_utils.h",
"policy/reporting/metrics_reporting/network/fake_network_diagnostics_util.cc",
@@ -5782,8 +5782,9 @@
"policy/off_hours/device_off_hours_controller_unittest.cc",
"policy/off_hours/off_hours_policy_applier_unittest.cc",
"policy/off_hours/off_hours_proto_parser_unittest.cc",
- "policy/remote_commands/crd_admin_session_controller_unittest.cc",
- "policy/remote_commands/device_command_fetch_crd_availability_info_job_unittest.cc",
+ "policy/remote_commands/crd/crd_admin_session_controller_unittest.cc",
+ "policy/remote_commands/crd/device_command_fetch_crd_availability_info_job_unittest.cc",
+ "policy/remote_commands/crd/device_command_start_crd_session_job_unittest.cc",
"policy/remote_commands/device_command_fetch_support_packet_job_unittest.cc",
"policy/remote_commands/device_command_get_available_routines_job_unittest.cc",
"policy/remote_commands/device_command_get_routine_update_job_unittest.cc",
@@ -5797,7 +5798,6 @@
"policy/remote_commands/device_command_run_routine_job_unittest.cc",
"policy/remote_commands/device_command_screenshot_job_unittest.cc",
"policy/remote_commands/device_command_set_volume_job_unittest.cc",
- "policy/remote_commands/device_command_start_crd_session_job_unittest.cc",
"policy/remote_commands/device_command_wipe_users_job_unittest.cc",
"policy/remote_commands/fake_cros_network_config.cc",
"policy/remote_commands/fake_cros_network_config.h",
diff --git a/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc b/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc
index b1a267c5..3f83b83 100644
--- a/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc
+++ b/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc
@@ -50,7 +50,7 @@
#include "chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider.h"
#include "chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.h"
#include "chrome/browser/ash/policy/remote_commands/affiliated_remote_commands_invalidator.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_admin_session_controller.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.h"
#include "chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h"
#include "chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.h"
#include "chrome/browser/ash/policy/scheduled_task_handler/reboot_notifications_scheduler.h"
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.cc b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.cc
index 784638a8..e18a4f3 100644
--- a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.cc
+++ b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.cc
@@ -28,7 +28,7 @@
#include "chrome/browser/ash/policy/core/reporting_user_tracker.h"
#include "chrome/browser/ash/policy/enrollment/auto_enrollment_type_checker.h"
#include "chrome/browser/ash/policy/networking/euicc_status_uploader.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_admin_session_controller.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.h"
#include "chrome/browser/ash/policy/remote_commands/device_commands_factory_ash.h"
#include "chrome/browser/ash/policy/reporting/metrics_reporting/metric_reporting_manager.h"
#include "chrome/browser/ash/policy/reporting/os_updates/os_updates_reporter.h"
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash_unittest.cc b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash_unittest.cc
index 5b01284..e518a1e 100644
--- a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash_unittest.cc
+++ b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash_unittest.cc
@@ -31,7 +31,7 @@
#include "chrome/browser/ash/policy/enrollment/enrollment_handler.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_status.h"
-#include "chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.h"
#include "chrome/browser/ash/policy/uploading/heartbeat_scheduler.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
#include "chrome/browser/device_identity/device_oauth2_token_service.h"
diff --git a/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.h b/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.h
index 74279af..c001daf4 100644
--- a/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.h
+++ b/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.h
@@ -8,7 +8,7 @@
#include <memory>
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
-#include "chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.h"
namespace base {
class SequencedTaskRunner;
diff --git a/chrome/browser/ash/policy/remote_commands/OWNERS b/chrome/browser/ash/policy/remote_commands/OWNERS
index e071062..cb9ceff 100644
--- a/chrome/browser/ash/policy/remote_commands/OWNERS
+++ b/chrome/browser/ash/policy/remote_commands/OWNERS
@@ -1,6 +1,3 @@
-# For CRD related changes
-per-file *crd*=file://chrome/browser/ash/app_mode/OWNERS
-
# For reboot and powerwash. Please report issues at
# https://issuetracker.google.com/issues/new?component=1206077 (internal) or at
# https://issuetracker.google.com/issues/new?component=1185521 (public).
diff --git a/chrome/browser/ash/policy/remote_commands/crd/OWNERS b/chrome/browser/ash/policy/remote_commands/crd/OWNERS
new file mode 100644
index 0000000..471d601
--- /dev/null
+++ b/chrome/browser/ash/policy/remote_commands/crd/OWNERS
@@ -0,0 +1 @@
+file://chrome/browser/ash/app_mode/OWNERS
diff --git a/chrome/browser/ash/policy/remote_commands/crd/README.md b/chrome/browser/ash/policy/remote_commands/crd/README.md
new file mode 100644
index 0000000..ee3e44e
--- /dev/null
+++ b/chrome/browser/ash/policy/remote_commands/crd/README.md
@@ -0,0 +1,31 @@
+Chrome Remote Desktop
+---------------------
+
+
+This directory contains the code that controls the remote admin triggered
+Chrome Remote Desktop (CRD) sessions.
+
+These sessions are started through a remote command (sent from the DPanel
+devices page).
+
+Remote Commands
+---------------
+
+There are 2 remote commands involved in starting CRD sessions:
+
+ * FETCH_CRD_AVAILABILITY_INFO: This command queries the state
+ of the device, and returns if CRD sessions are possible and if not, why.
+ * START_CRD_SESSION: This command actually starts a CRD session.
+
+Public APIs
+-----------
+
+The public API of this folder exists out of 3 classes:
+
+ * `DeviceCommandFetchCrdAvailabilityInfoJob`: The `RemoteCommandJob` that handles the
+ FETCH_CRD_AVAILABILITY_INFO remote command.
+ * `DeviceCommandStartCrdSessionJob`: The `RemoteCommandJob` that handles the
+ START_CRD_SESSION remote command.
+ * `CrdAdminSessionController`: The long-lived controller that keeps track of
+ the currently active CRD session.
+
diff --git a/chrome/browser/ash/policy/remote_commands/crd_admin_session_controller.cc b/chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.cc
similarity index 97%
rename from chrome/browser/ash/policy/remote_commands/crd_admin_session_controller.cc
rename to chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.cc
index 2a164678..28e10b9 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_admin_session_controller.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.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/ash/policy/remote_commands/crd_admin_session_controller.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.h"
#include <iomanip>
#include <memory>
@@ -19,7 +19,6 @@
#include "base/check_is_test.h"
#include "base/functional/bind.h"
#include "base/functional/callback_forward.h"
-#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ref.h"
#include "base/memory/weak_ptr.h"
@@ -27,12 +26,12 @@
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "base/types/expected.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_logging.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_oauth_token_fetcher.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_session_observer.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_support_host_observer_proxy.h"
-#include "chrome/browser/ash/policy/remote_commands/remote_activity_notification_controller.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_logging.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_oauth_token_fetcher.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_session_observer.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_support_host_observer_proxy.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/remote_activity_notification_controller.h"
#include "chrome/browser/device_identity/device_oauth2_token_service_factory.h"
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/ash/policy/remote_commands/crd_admin_session_controller.h b/chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.h
similarity index 90%
rename from chrome/browser/ash/policy/remote_commands/crd_admin_session_controller.h
rename to chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.h
index b282540..4f88ed4 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_admin_session_controller.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.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_ASH_POLICY_REMOTE_COMMANDS_CRD_ADMIN_SESSION_CONTROLLER_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_ADMIN_SESSION_CONTROLLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_ADMIN_SESSION_CONTROLLER_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_ADMIN_SESSION_CONTROLLER_H_
#include <memory>
#include <optional>
@@ -14,9 +14,9 @@
#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/types/expected.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_session_observer.h"
-#include "chrome/browser/ash/policy/remote_commands/remote_activity_notification_controller.h"
-#include "chrome/browser/ash/policy/remote_commands/start_crd_session_job_delegate.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_session_observer.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/remote_activity_notification_controller.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/start_crd_session_job_delegate.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -134,4 +134,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_ADMIN_SESSION_CONTROLLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_ADMIN_SESSION_CONTROLLER_H_
diff --git a/chrome/browser/ash/policy/remote_commands/crd_admin_session_controller_unittest.cc b/chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller_unittest.cc
similarity index 99%
rename from chrome/browser/ash/policy/remote_commands/crd_admin_session_controller_unittest.cc
rename to chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller_unittest.cc
index 2926c5d..83476ea 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_admin_session_controller_unittest.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller_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/ash/policy/remote_commands/crd_admin_session_controller.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.h"
#include <optional>
#include <string>
@@ -24,7 +24,7 @@
#include "base/test/test_future.h"
#include "base/time/time.h"
#include "chrome/browser/ash/login/ui/mock_login_display_host.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/ash/policy/remote_commands/crd_logging.h b/chrome/browser/ash/policy/remote_commands/crd/crd_logging.h
similarity index 61%
rename from chrome/browser/ash/policy/remote_commands/crd_logging.h
rename to chrome/browser/ash/policy/remote_commands/crd/crd_logging.h
index 717fbe5..f51fd8d1 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_logging.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_logging.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_ASH_POLICY_REMOTE_COMMANDS_CRD_LOGGING_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_LOGGING_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_LOGGING_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_LOGGING_H_
#include "base/logging.h"
@@ -11,4 +11,4 @@
#define CRD_VLOG(level) VLOG(level) << "CRD: "
#define CRD_LOG(level) LOG(level) << "CRD: "
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_LOGGING_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_LOGGING_H_
diff --git a/chrome/browser/ash/policy/remote_commands/crd_oauth_token_fetcher.cc b/chrome/browser/ash/policy/remote_commands/crd/crd_oauth_token_fetcher.cc
similarity index 93%
rename from chrome/browser/ash/policy/remote_commands/crd_oauth_token_fetcher.cc
rename to chrome/browser/ash/policy/remote_commands/crd/crd_oauth_token_fetcher.cc
index f35e8a7..b6103c8 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_oauth_token_fetcher.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_oauth_token_fetcher.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ash/policy/remote_commands/crd_oauth_token_fetcher.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_oauth_token_fetcher.h"
#include <memory>
#include <optional>
#include <string>
#include <utility>
-#include "chrome/browser/ash/policy/remote_commands/crd_logging.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_logging.h"
#include "chrome/browser/device_identity/device_oauth2_token_service.h"
#include "google_apis/gaia/gaia_constants.h"
#include "google_apis/gaia/oauth2_access_token_manager.h"
diff --git a/chrome/browser/ash/policy/remote_commands/crd_oauth_token_fetcher.h b/chrome/browser/ash/policy/remote_commands/crd/crd_oauth_token_fetcher.h
similarity index 90%
rename from chrome/browser/ash/policy/remote_commands/crd_oauth_token_fetcher.h
rename to chrome/browser/ash/policy/remote_commands/crd/crd_oauth_token_fetcher.h
index 75b63d9..c0b83834 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_oauth_token_fetcher.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_oauth_token_fetcher.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_ASH_POLICY_REMOTE_COMMANDS_CRD_OAUTH_TOKEN_FETCHER_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_OAUTH_TOKEN_FETCHER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_OAUTH_TOKEN_FETCHER_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_OAUTH_TOKEN_FETCHER_H_
#include <memory>
#include <optional>
@@ -76,4 +76,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_OAUTH_TOKEN_FETCHER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_OAUTH_TOKEN_FETCHER_H_
diff --git a/chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.cc b/chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.cc
similarity index 98%
rename from chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.cc
rename to chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.cc
index 4729fec..6ffbd17 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.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/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
#include "base/check_deref.h"
#include "base/functional/bind.h"
@@ -11,7 +11,7 @@
#include "chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_chrome_app_manager.h"
#include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_logging.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_logging.h"
#include "chromeos/ash/services/network_config/in_process_instance.h"
#include "components/user_manager/user_manager.h"
#include "remoting/protocol/errors.h"
diff --git a/chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h b/chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h
similarity index 96%
rename from chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h
rename to chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h
index db00310..b759198 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h
@@ -6,8 +6,8 @@
// remote commands (`FETCH_CRD_AVAILABILITY_INFO` and
// `DEVICE_START_CRD_SESSION`).
-#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_REMOTE_COMMAND_UTILS_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_REMOTE_COMMAND_UTILS_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_REMOTE_COMMAND_UTILS_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_REMOTE_COMMAND_UTILS_H_
#include "base/functional/callback_forward.h"
#include "base/time/time.h"
@@ -178,4 +178,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_REMOTE_COMMAND_UTILS_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_REMOTE_COMMAND_UTILS_H_
diff --git a/chrome/browser/ash/policy/remote_commands/crd_session_observer.h b/chrome/browser/ash/policy/remote_commands/crd/crd_session_observer.h
similarity index 78%
rename from chrome/browser/ash/policy/remote_commands/crd_session_observer.h
rename to chrome/browser/ash/policy/remote_commands/crd/crd_session_observer.h
index 76ba4d37..7368c0a 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_session_observer.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_session_observer.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_SESSION_OBSERVER_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_SESSION_OBSERVER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_SESSION_OBSERVER_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_SESSION_OBSERVER_H_
#include <string>
#include "base/observer_list_types.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
namespace policy {
@@ -39,4 +39,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_SESSION_OBSERVER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_SESSION_OBSERVER_H_
diff --git a/chrome/browser/ash/policy/remote_commands/crd_support_host_observer_proxy.cc b/chrome/browser/ash/policy/remote_commands/crd/crd_support_host_observer_proxy.cc
similarity index 92%
rename from chrome/browser/ash/policy/remote_commands/crd_support_host_observer_proxy.cc
rename to chrome/browser/ash/policy/remote_commands/crd/crd_support_host_observer_proxy.cc
index d1a4928..82d283c 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_support_host_observer_proxy.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_support_host_observer_proxy.cc
@@ -2,12 +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/policy/remote_commands/crd_support_host_observer_proxy.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_support_host_observer_proxy.h"
#include "base/functional/bind.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_logging.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_session_observer.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_logging.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_session_observer.h"
#include "remoting/protocol/errors.h"
using remoting::protocol::ErrorCode;
diff --git a/chrome/browser/ash/policy/remote_commands/crd_support_host_observer_proxy.h b/chrome/browser/ash/policy/remote_commands/crd/crd_support_host_observer_proxy.h
similarity index 86%
rename from chrome/browser/ash/policy/remote_commands/crd_support_host_observer_proxy.h
rename to chrome/browser/ash/policy/remote_commands/crd/crd_support_host_observer_proxy.h
index 93fbbef..82549004 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_support_host_observer_proxy.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_support_host_observer_proxy.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_ASH_POLICY_REMOTE_COMMANDS_CRD_SUPPORT_HOST_OBSERVER_PROXY_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_SUPPORT_HOST_OBSERVER_PROXY_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_SUPPORT_HOST_OBSERVER_PROXY_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_SUPPORT_HOST_OBSERVER_PROXY_H_
#include <cstdint>
#include <memory>
@@ -11,7 +11,7 @@
#include <vector>
#include "base/observer_list.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "remoting/host/mojom/remote_support.mojom.h"
@@ -68,4 +68,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_SUPPORT_HOST_OBSERVER_PROXY_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_SUPPORT_HOST_OBSERVER_PROXY_H_
diff --git a/chrome/browser/ash/policy/remote_commands/crd_uma_logger.cc b/chrome/browser/ash/policy/remote_commands/crd/crd_uma_logger.cc
similarity index 94%
rename from chrome/browser/ash/policy/remote_commands/crd_uma_logger.cc
rename to chrome/browser/ash/policy/remote_commands/crd/crd_uma_logger.cc
index 1f9bbf2..e3beb26 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_uma_logger.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_uma_logger.cc
@@ -2,12 +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/policy/remote_commands/crd_uma_logger.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_uma_logger.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
#include "components/policy/core/common/cloud/enterprise_metrics.h"
#include "device_management_backend.pb.h"
diff --git a/chrome/browser/ash/policy/remote_commands/crd_uma_logger.h b/chrome/browser/ash/policy/remote_commands/crd/crd_uma_logger.h
similarity index 76%
rename from chrome/browser/ash/policy/remote_commands/crd_uma_logger.h
rename to chrome/browser/ash/policy/remote_commands/crd/crd_uma_logger.h
index 7ecaf82..cb64548 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_uma_logger.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/crd_uma_logger.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_UMA_LOGGER_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_UMA_LOGGER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_UMA_LOGGER_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_UMA_LOGGER_H_
#include <string>
#include "base/time/time.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
namespace policy {
@@ -36,4 +36,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_UMA_LOGGER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_CRD_UMA_LOGGER_H_
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job.cc b/chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.cc
similarity index 94%
rename from chrome/browser/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job.cc
rename to chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.cc
index 14014a91..2c33dda 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.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/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.h"
#include "base/check_deref.h"
#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/numerics/clamped_math.h"
#include "base/time/time.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_logging.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_logging.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
#include "chrome/browser/browser_process.h"
#include "chrome/common/pref_names.h"
#include "components/policy/core/common/remote_commands/remote_command_job.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job.h b/chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.h
similarity index 79%
rename from chrome/browser/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job.h
rename to chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.h
index bf189a6..458dca8b2 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.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_ASH_POLICY_REMOTE_COMMANDS_DEVICE_COMMAND_FETCH_CRD_AVAILABILITY_INFO_JOB_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_DEVICE_COMMAND_FETCH_CRD_AVAILABILITY_INFO_JOB_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_DEVICE_COMMAND_FETCH_CRD_AVAILABILITY_INFO_JOB_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_DEVICE_COMMAND_FETCH_CRD_AVAILABILITY_INFO_JOB_H_
#include "base/memory/weak_ptr.h"
#include "components/policy/core/common/remote_commands/remote_command_job.h"
@@ -34,4 +34,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_DEVICE_COMMAND_FETCH_CRD_AVAILABILITY_INFO_JOB_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_DEVICE_COMMAND_FETCH_CRD_AVAILABILITY_INFO_JOB_H_
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job_unittest.cc b/chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job_unittest.cc
similarity index 98%
rename from chrome/browser/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job_unittest.cc
rename to chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job_unittest.cc
index 7c47ce1..8981e98 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job_unittest.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job_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/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.h"
#include <cstdint>
#include <memory>
@@ -17,7 +17,7 @@
#include "chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_chrome_app_manager.h"
#include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
#include "chrome/browser/ash/policy/remote_commands/fake_cros_network_config.h"
#include "chrome/browser/ash/policy/remote_commands/user_session_type_test_util.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc b/chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job.cc
similarity index 97%
rename from chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc
rename to chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job.cc
index 4ec221d2..80c8bb5c 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job.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/ash/policy/remote_commands/device_command_start_crd_session_job.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job.h"
#include <iomanip>
#include <memory>
@@ -24,10 +24,10 @@
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "base/values.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_logging.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_oauth_token_fetcher.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_uma_logger.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_logging.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_oauth_token_fetcher.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_uma_logger.h"
#include "chrome/browser/device_identity/device_oauth2_token_service.h"
#include "chrome/browser/device_identity/device_oauth2_token_service_factory.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.h b/chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job.h
similarity index 89%
rename from chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.h
rename to chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job.h
index dc540639..461cf4c 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job.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_ASH_POLICY_REMOTE_COMMANDS_DEVICE_COMMAND_START_CRD_SESSION_JOB_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_DEVICE_COMMAND_START_CRD_SESSION_JOB_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_DEVICE_COMMAND_START_CRD_SESSION_JOB_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_DEVICE_COMMAND_START_CRD_SESSION_JOB_H_
#include <memory>
#include <optional>
@@ -14,8 +14,8 @@
#include "base/memory/raw_ref.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
-#include "chrome/browser/ash/policy/remote_commands/start_crd_session_job_delegate.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/start_crd_session_job_delegate.h"
#include "components/policy/core/common/remote_commands/remote_command_job.h"
namespace policy {
@@ -113,4 +113,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_DEVICE_COMMAND_START_CRD_SESSION_JOB_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_DEVICE_COMMAND_START_CRD_SESSION_JOB_H_
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job_unittest.cc b/chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job_unittest.cc
similarity index 99%
rename from chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job_unittest.cc
rename to chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job_unittest.cc
index af6153b..09d1931 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job_unittest.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job_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/ash/policy/remote_commands/device_command_start_crd_session_job.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job.h"
#include <memory>
#include <optional>
@@ -20,9 +20,9 @@
#include "chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_chrome_app_manager.h"
#include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
#include "chrome/browser/ash/policy/remote_commands/fake_cros_network_config.h"
-#include "chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.h"
#include "chrome/browser/ash/policy/remote_commands/user_session_type_test_util.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
#include "chrome/browser/prefs/browser_prefs.h"
diff --git a/chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.cc b/chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.cc
similarity index 94%
rename from chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.cc
rename to chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.cc
index 2112727..9125454 100644
--- a/chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.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/ash/policy/remote_commands/fake_start_crd_session_job_delegate.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.h"
#include "base/functional/callback.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.h b/chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.h
similarity index 81%
rename from chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.h
rename to chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.h
index 58b7d0ab..37a586d 100644
--- a/chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_FAKE_START_CRD_SESSION_JOB_DELEGATE_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_FAKE_START_CRD_SESSION_JOB_DELEGATE_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_FAKE_START_CRD_SESSION_JOB_DELEGATE_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_FAKE_START_CRD_SESSION_JOB_DELEGATE_H_
-#include "chrome/browser/ash/policy/remote_commands/start_crd_session_job_delegate.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/start_crd_session_job_delegate.h"
#include "base/functional/callback.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
@@ -49,4 +49,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_FAKE_START_CRD_SESSION_JOB_DELEGATE_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_FAKE_START_CRD_SESSION_JOB_DELEGATE_H_
diff --git a/chrome/browser/ash/policy/remote_commands/remote_activity_notification_controller.cc b/chrome/browser/ash/policy/remote_commands/crd/remote_activity_notification_controller.cc
similarity index 95%
rename from chrome/browser/ash/policy/remote_commands/remote_activity_notification_controller.cc
rename to chrome/browser/ash/policy/remote_commands/crd/remote_activity_notification_controller.cc
index 22ce8441..dc87a12 100644
--- a/chrome/browser/ash/policy/remote_commands/remote_activity_notification_controller.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/remote_activity_notification_controller.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/ash/policy/remote_commands/remote_activity_notification_controller.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/remote_activity_notification_controller.h"
#include <memory>
diff --git a/chrome/browser/ash/policy/remote_commands/remote_activity_notification_controller.h b/chrome/browser/ash/policy/remote_commands/crd/remote_activity_notification_controller.h
similarity index 82%
rename from chrome/browser/ash/policy/remote_commands/remote_activity_notification_controller.h
rename to chrome/browser/ash/policy/remote_commands/crd/remote_activity_notification_controller.h
index 61d709b..677d6fb 100644
--- a/chrome/browser/ash/policy/remote_commands/remote_activity_notification_controller.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/remote_activity_notification_controller.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_REMOTE_ACTIVITY_NOTIFICATION_CONTROLLER_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_REMOTE_ACTIVITY_NOTIFICATION_CONTROLLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_REMOTE_ACTIVITY_NOTIFICATION_CONTROLLER_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_REMOTE_ACTIVITY_NOTIFICATION_CONTROLLER_H_
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_session_observer.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_session_observer.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_member.h"
#include "components/prefs/pref_observer.h"
@@ -55,4 +55,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_REMOTE_ACTIVITY_NOTIFICATION_CONTROLLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_REMOTE_ACTIVITY_NOTIFICATION_CONTROLLER_H_
diff --git a/chrome/browser/ash/policy/remote_commands/start_crd_session_job_delegate.cc b/chrome/browser/ash/policy/remote_commands/crd/start_crd_session_job_delegate.cc
similarity index 88%
rename from chrome/browser/ash/policy/remote_commands/start_crd_session_job_delegate.cc
rename to chrome/browser/ash/policy/remote_commands/crd/start_crd_session_job_delegate.cc
index 34a432d..22e28c6 100644
--- a/chrome/browser/ash/policy/remote_commands/start_crd_session_job_delegate.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd/start_crd_session_job_delegate.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/ash/policy/remote_commands/start_crd_session_job_delegate.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/start_crd_session_job_delegate.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/remote_commands/start_crd_session_job_delegate.h b/chrome/browser/ash/policy/remote_commands/crd/start_crd_session_job_delegate.h
similarity index 85%
rename from chrome/browser/ash/policy/remote_commands/start_crd_session_job_delegate.h
rename to chrome/browser/ash/policy/remote_commands/crd/start_crd_session_job_delegate.h
index a1e94a3..d2350d4 100644
--- a/chrome/browser/ash/policy/remote_commands/start_crd_session_job_delegate.h
+++ b/chrome/browser/ash/policy/remote_commands/crd/start_crd_session_job_delegate.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_START_CRD_SESSION_JOB_DELEGATE_H_
-#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_START_CRD_SESSION_JOB_DELEGATE_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_START_CRD_SESSION_JOB_DELEGATE_H_
+#define CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_START_CRD_SESSION_JOB_DELEGATE_H_
#include <string>
#include "base/functional/callback_forward.h"
#include "base/time/time.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
namespace policy {
@@ -66,4 +66,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_START_CRD_SESSION_JOB_DELEGATE_H_
+#endif // CHROME_BROWSER_ASH_POLICY_REMOTE_COMMANDS_CRD_START_CRD_SESSION_JOB_DELEGATE_H_
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_job.cc
index 07d3d0722..d9a7e31f 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_job.cc
+++ b/chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_job.cc
@@ -29,7 +29,7 @@
#include "base/values.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_remote_command_utils.h"
#include "chrome/browser/ash/policy/uploading/system_log_uploader.h"
#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_commands_factory_ash.cc b/chrome/browser/ash/policy/remote_commands/device_commands_factory_ash.cc
index a589e78..8d371333 100644
--- a/chrome/browser/ash/policy/remote_commands/device_commands_factory_ash.cc
+++ b/chrome/browser/ash/policy/remote_commands/device_commands_factory_ash.cc
@@ -8,7 +8,8 @@
#include "base/notreached.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
-#include "chrome/browser/ash/policy/remote_commands/device_command_fetch_crd_availability_info_job.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/device_command_fetch_crd_availability_info_job.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job.h"
#include "chrome/browser/ash/policy/remote_commands/device_command_fetch_status_job.h"
#include "chrome/browser/ash/policy/remote_commands/device_command_fetch_support_packet_job.h"
#include "chrome/browser/ash/policy/remote_commands/device_command_get_available_routines_job.h"
@@ -20,7 +21,6 @@
#include "chrome/browser/ash/policy/remote_commands/device_command_run_routine_job.h"
#include "chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.h"
#include "chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.h"
-#include "chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.h"
#include "chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job.h"
#include "chrome/browser/ash/policy/remote_commands/fake_screenshot_delegate.h"
#include "chrome/browser/ash/policy/remote_commands/screenshot_delegate.h"
diff --git a/chrome/browser/ash/policy/remote_commands/remote_commands_fuzzer.cc b/chrome/browser/ash/policy/remote_commands/remote_commands_fuzzer.cc
index 4d27a0c..cdee7bd 100644
--- a/chrome/browser/ash/policy/remote_commands/remote_commands_fuzzer.cc
+++ b/chrome/browser/ash/policy/remote_commands/remote_commands_fuzzer.cc
@@ -18,12 +18,12 @@
#include "base/syslog_logging.h"
#include "base/time/time.h"
#include "build/build_config.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/device_command_start_crd_session_job.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.h"
#include "chrome/browser/ash/policy/remote_commands/device_command_get_routine_update_job.h"
#include "chrome/browser/ash/policy/remote_commands/device_command_run_routine_job.h"
#include "chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.h"
#include "chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.h"
-#include "chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.h"
-#include "chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "components/policy/proto/device_management_backend.pb.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 904b688..e6ca2f5 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -218,7 +218,7 @@
#include "chrome/browser/ash/net/system_proxy_manager.h"
#include "chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.h"
#include "chrome/browser/ash/policy/networking/euicc_status_uploader.h"
-#include "chrome/browser/ash/policy/remote_commands/crd_admin_session_controller.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/crd_admin_session_controller.h"
#include "chrome/browser/ash/settings/hardware_data_usage_controller.h"
#include "chrome/browser/ash/settings/stats_reporting_controller.h"
#include "chrome/browser/component_updater/metadata_table_chromeos.h"
diff --git a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
index d14f9b09..241af788 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
@@ -21,7 +21,7 @@
#include "base/task/single_thread_task_runner.h"
#include "base/values.h"
#include "build/chromeos_buildflags.h"
-#include "chrome/browser/ash/policy/remote_commands/fake_start_crd_session_job_delegate.h"
+#include "chrome/browser/ash/policy/remote_commands/crd/fake_start_crd_session_job_delegate.h"
#include "chrome/browser/enterprise/connectors/test/deep_scanning_test_utils.h"
#include "chrome/browser/enterprise/reporting/prefs.h"
#include "chrome/browser/policy/dm_token_utils.h"
