Move //chrome/browser/{chromeos => ash}/policy [4/10]
enrollment/, and external_data/ are moved to //chrome/browser/ash/policy.
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Bug: 1164001
Change-Id: I905534a81e86b9ce362d709df9cb712b970776f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2984383
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Commit-Queue: Yeunjoo Choi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#898805}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index c627980a..f81a1d1 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -7097,6 +7097,10 @@
"ash/policy/core/device_policy_builder.h",
"ash/policy/core/fake_device_cloud_policy_manager.cc",
"ash/policy/core/fake_device_cloud_policy_manager.h",
+ "ash/policy/enrollment/fake_device_cloud_policy_initializer.cc",
+ "ash/policy/enrollment/fake_device_cloud_policy_initializer.h",
+ "ash/policy/external_data/cloud_external_data_manager_base_test_util.cc",
+ "ash/policy/external_data/cloud_external_data_manager_base_test_util.h",
"chromeos/input_method/mock_candidate_window_controller.cc",
"chromeos/input_method/mock_candidate_window_controller.h",
"chromeos/input_method/mock_input_method_engine.cc",
@@ -7105,10 +7109,6 @@
"chromeos/input_method/mock_input_method_manager_impl.h",
"chromeos/net/network_portal_detector_test_utils.cc",
"chromeos/net/network_portal_detector_test_utils.h",
- "chromeos/policy/enrollment/fake_device_cloud_policy_initializer.cc",
- "chromeos/policy/enrollment/fake_device_cloud_policy_initializer.h",
- "chromeos/policy/external_data/cloud_external_data_manager_base_test_util.cc",
- "chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h",
"ui/app_list/test/chrome_app_list_test_support.cc",
"ui/app_list/test/chrome_app_list_test_support.h",
"ui/app_list/test/test_app_list_controller_delegate.cc",
diff --git a/chrome/browser/ash/accessibility/accessibility_manager.cc b/chrome/browser/ash/accessibility/accessibility_manager.cc
index b3f87f7..9df26bc 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager.cc
+++ b/chrome/browser/ash/accessibility/accessibility_manager.cc
@@ -43,10 +43,10 @@
#include "chrome/browser/ash/accessibility/magnification_manager.h"
#include "chrome/browser/ash/accessibility/select_to_speak_event_handler_delegate_impl.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/extensions/api/braille_display_private/stub_braille_controller.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/login/configuration_based_oobe_browsertest.cc b/chrome/browser/ash/login/configuration_based_oobe_browsertest.cc
index 7c64bbd..631f979 100644
--- a/chrome/browser/ash/login/configuration_based_oobe_browsertest.cc
+++ b/chrome/browser/ash/login/configuration_based_oobe_browsertest.cc
@@ -17,10 +17,10 @@
#include "chrome/browser/ash/login/test/oobe_configuration_waiter.h"
#include "chrome/browser/ash/login/test/oobe_screen_waiter.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ui/webui/chromeos/login/demo_preferences_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc b/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc
index 0ac74ed..2af52a5 100644
--- a/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc
@@ -26,10 +26,10 @@
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
#include "chrome/browser/ash/policy/core/device_local_account.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc
index f0a08e209..b129181 100644
--- a/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc
@@ -15,9 +15,9 @@
#include "base/test/task_environment.h"
#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/login/demo_mode/demo_setup_test_utils.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/scoped_testing_local_state.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_setup_test_utils.h b/chrome/browser/ash/login/demo_mode/demo_setup_test_utils.h
index b4e4330..6fbf8286 100644
--- a/chrome/browser/ash/login/demo_mode/demo_setup_test_utils.h
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_test_utils.h
@@ -10,7 +10,7 @@
#include "base/files/scoped_temp_dir.h"
#include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h"
#include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_mock.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/policy/enrollment_status.h"
#include "chromeos/tpm/install_attributes.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
diff --git a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc
index 4bd6ceca..8febd02 100644
--- a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc
+++ b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc
@@ -15,10 +15,10 @@
#include "base/time/time.h"
#include "build/branding_buildflags.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
+#include "chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl.h"
#include "chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.h"
#include "chrome/browser/net/system_network_context_manager.h"
#include "chromeos/dbus/cryptohome/rpc.pb.h"
diff --git a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h
index 232f594..90a59b4 100644
--- a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h
+++ b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h
@@ -13,8 +13,8 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
+#include "chrome/browser/ash/policy/enrollment/auto_enrollment_client.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
-#include "chrome/browser/chromeos/policy/enrollment/auto_enrollment_client.h"
#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/login/enrollment/enrollment_local_policy_server_browsertest.cc b/chrome/browser/ash/login/enrollment/enrollment_local_policy_server_browsertest.cc
index a0acbec..7ea007a 100644
--- a/chrome/browser/ash/login/enrollment/enrollment_local_policy_server_browsertest.cc
+++ b/chrome/browser/ash/login/enrollment/enrollment_local_policy_server_browsertest.cc
@@ -30,10 +30,10 @@
#include "chrome/browser/ash/login/wizard_controller.h"
#include "chrome/browser/ash/ownership/fake_owner_settings_service.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/chromeos/policy/server_backed_state/server_backed_state_keys_broker.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h"
diff --git a/chrome/browser/ash/login/enrollment/enrollment_screen.h b/chrome/browser/ash/login/enrollment/enrollment_screen.h
index 17fb30f..4bc5d65 100644
--- a/chrome/browser/ash/login/enrollment/enrollment_screen.h
+++ b/chrome/browser/ash/login/enrollment/enrollment_screen.h
@@ -22,7 +22,7 @@
#include "chrome/browser/ash/login/screens/base_screen.h"
#include "chrome/browser/ash/login/wizard_context.h"
#include "chrome/browser/ash/policy/active_directory/active_directory_join_delegate.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "components/policy/core/common/cloud/enterprise_metrics.h"
#include "net/base/backoff_entry.h"
diff --git a/chrome/browser/ash/login/enrollment/enrollment_screen_unittest.cc b/chrome/browser/ash/login/enrollment/enrollment_screen_unittest.cc
index ca9c2b5..3e2a72c 100644
--- a/chrome/browser/ash/login/enrollment/enrollment_screen_unittest.cc
+++ b/chrome/browser/ash/login/enrollment/enrollment_screen_unittest.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_mock.h"
#include "chrome/browser/ash/login/enrollment/mock_enrollment_screen.h"
#include "chrome/browser/ash/login/wizard_context.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/policy/enrollment_status.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/ash/login/enrollment/enrollment_uma.h b/chrome/browser/ash/login/enrollment/enrollment_uma.h
index cb8d8533..8837188e 100644
--- a/chrome/browser/ash/login/enrollment/enrollment_uma.h
+++ b/chrome/browser/ash/login/enrollment/enrollment_uma.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_ASH_LOGIN_ENROLLMENT_ENROLLMENT_UMA_H_
#define CHROME_BROWSER_ASH_LOGIN_ENROLLMENT_ENROLLMENT_UMA_H_
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "components/policy/core/common/cloud/enterprise_metrics.h"
namespace ash {
diff --git a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h
index 836cba2..7b849d7 100644
--- a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h
+++ b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h
@@ -11,7 +11,7 @@
#include "base/callback_forward.h"
#include "base/macros.h"
-#include "chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h"
+#include "chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
class GoogleServiceAuthError;
diff --git a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc
index e667455..d30871b 100644
--- a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc
+++ b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc
@@ -18,10 +18,10 @@
#include "chrome/browser/ash/login/startup_utils.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
#include "chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h"
+#include "chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h"
#include "chrome/browser/net/system_network_context_manager.h"
#include "chrome/browser/policy/enrollment_status.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h
index 946e9f6..5aae128 100644
--- a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h
+++ b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h
@@ -13,7 +13,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "components/policy/core/common/cloud/dm_auth.h"
#include "components/policy/core/common/cloud/enterprise_metrics.h"
#include "google_apis/gaia/google_service_auth_error.h"
diff --git a/chrome/browser/ash/login/enrollment/mock_enrollment_screen.h b/chrome/browser/ash/login/enrollment/mock_enrollment_screen.h
index ee37c51..1bf2a2b 100644
--- a/chrome/browser/ash/login/enrollment/mock_enrollment_screen.h
+++ b/chrome/browser/ash/login/enrollment/mock_enrollment_screen.h
@@ -7,7 +7,7 @@
#include "chrome/browser/ash/login/enrollment/enrollment_screen.h"
#include "chrome/browser/ash/login/enrollment/enrollment_screen_view.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/policy/enrollment_status.h"
#include "google_apis/gaia/google_service_auth_error.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/login/eula_browsertest.cc b/chrome/browser/ash/login/eula_browsertest.cc
index 0313cef1..22afdced 100644
--- a/chrome/browser/ash/login/eula_browsertest.cc
+++ b/chrome/browser/ash/login/eula_browsertest.cc
@@ -25,9 +25,9 @@
#include "chrome/browser/ash/login/test/webview_content_extractor.h"
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/settings/stats_reporting_controller.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
diff --git a/chrome/browser/ash/login/oobe_browsertest.cc b/chrome/browser/ash/login/oobe_browsertest.cc
index 5cba7cc..a6b91cf 100644
--- a/chrome/browser/ash/login/oobe_browsertest.cc
+++ b/chrome/browser/ash/login/oobe_browsertest.cc
@@ -20,8 +20,8 @@
#include "chrome/browser/ash/login/test/session_manager_state_waiter.h"
#include "chrome/browser/ash/login/ui/login_display_host_webui.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
diff --git a/chrome/browser/ash/login/screens/eula_screen.cc b/chrome/browser/ash/login/screens/eula_screen.cc
index 5922d84..07e658ed2 100644
--- a/chrome/browser/ash/login/screens/eula_screen.cc
+++ b/chrome/browser/ash/login/screens/eula_screen.cc
@@ -12,8 +12,8 @@
#include "chrome/browser/ash/customization/customization_document.h"
#include "chrome/browser/ash/login/wizard_context.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
#include "chromeos/dbus/dbus_method_call_status.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/ash/login/screens/packaged_license_screen.cc b/chrome/browser/ash/login/screens/packaged_license_screen.cc
index 973a868..f9690cb 100644
--- a/chrome/browser/ash/login/screens/packaged_license_screen.cc
+++ b/chrome/browser/ash/login/screens/packaged_license_screen.cc
@@ -5,9 +5,9 @@
#include "chrome/browser/ash/login/screens/packaged_license_screen.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
#include "chrome/browser/ui/webui/chromeos/login/packaged_license_screen_handler.h"
namespace ash {
diff --git a/chrome/browser/ash/login/screens/packaged_license_screen_browsertest.cc b/chrome/browser/ash/login/screens/packaged_license_screen_browsertest.cc
index 0b5a2f5..79905c2 100644
--- a/chrome/browser/ash/login/screens/packaged_license_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/packaged_license_screen_browsertest.cc
@@ -11,8 +11,8 @@
#include "chrome/browser/ash/login/test/oobe_base_test.h"
#include "chrome/browser/ash/login/test/oobe_screen_waiter.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
#include "chrome/browser/chromeos/policy/server_backed_state/server_backed_device_state.h"
#include "chrome/browser/ui/webui/chromeos/login/packaged_license_screen_handler.h"
#include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ash/login/screens/welcome_screen.cc b/chrome/browser/ash/login/screens/welcome_screen.cc
index 4bb29c5..8bb197f 100644
--- a/chrome/browser/ash/login/screens/welcome_screen.cc
+++ b/chrome/browser/ash/login/screens/welcome_screen.cc
@@ -25,10 +25,10 @@
#include "chrome/browser/ash/login/oobe_screen.h"
#include "chrome/browser/ash/login/ui/input_events_blocker.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/system/timezone_resolver_manager.h"
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
diff --git a/chrome/browser/ash/login/test/enrollment_helper_mixin.h b/chrome/browser/ash/login/test/enrollment_helper_mixin.h
index dce8d1c..724417e 100644
--- a/chrome/browser/ash/login/test/enrollment_helper_mixin.h
+++ b/chrome/browser/ash/login/test/enrollment_helper_mixin.h
@@ -12,7 +12,7 @@
#include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h"
// TODO(https://crbug.com/1164001): move to forward declaration.
#include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_mock.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/policy/enrollment_status.h"
#include "chrome/test/base/mixin_based_in_process_browser_test.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
diff --git a/chrome/browser/ash/login/test/local_policy_test_server_mixin.cc b/chrome/browser/ash/login/test/local_policy_test_server_mixin.cc
index bc35da8c..bff5857 100644
--- a/chrome/browser/ash/login/test/local_policy_test_server_mixin.cc
+++ b/chrome/browser/ash/login/test/local_policy_test_server_mixin.cc
@@ -9,9 +9,9 @@
#include "base/guid.h"
#include "chrome/browser/ash/login/test/fake_gaia_mixin.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
+#include "chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h"
#include "chromeos/attestation/fake_attestation_flow.h"
#include "chromeos/system/fake_statistics_provider.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_webui.cc b/chrome/browser/ash/login/ui/login_display_host_webui.cc
index 959b8193..e8b2093 100644
--- a/chrome/browser/ash/login/ui/login_display_host_webui.cc
+++ b/chrome/browser/ash/login/ui/login_display_host_webui.cc
@@ -47,6 +47,8 @@
#include "chrome/browser/ash/login/ui/webui_login_view.h"
#include "chrome/browser/ash/login/wizard_controller.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/device_disabling_manager.h"
#include "chrome/browser/ash/system/input_device_settings.h"
@@ -60,8 +62,6 @@
#include "chrome/browser/chromeos/first_run/first_run.h"
#include "chrome/browser/chromeos/language_preferences.h"
#include "chrome/browser/chromeos/net/delay_network_call.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/lifetime/browser_shutdown.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/ash/ash_util.h"
diff --git a/chrome/browser/ash/login/users/avatar/user_image_manager_browsertest.cc b/chrome/browser/ash/login/users/avatar/user_image_manager_browsertest.cc
index 0c303d55..abfbc01 100644
--- a/chrome/browser/ash/login/users/avatar/user_image_manager_browsertest.cc
+++ b/chrome/browser/ash/login/users/avatar/user_image_manager_browsertest.cc
@@ -38,9 +38,9 @@
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/policy/core/device_policy_builder.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_downloader.h"
#include "chrome/browser/signin/identity_manager_factory.h"
diff --git a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
index 18d8a48..62babef 100644
--- a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
@@ -49,6 +49,11 @@
#include "chrome/browser/ash/login/users/multi_profile_user_controller.h"
#include "chrome/browser/ash/login/users/supervised_user_manager_impl.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
+#include "chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/timezone_resolver_manager.h"
@@ -59,11 +64,6 @@
#include "chrome/browser/chromeos/extensions/active_tab_permission_granter_delegate_chromeos.h"
#include "chrome/browser/chromeos/extensions/extension_tab_util_delegate_chromeos.h"
#include "chrome/browser/chromeos/extensions/permissions_updater_delegate_chromeos.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/print_servers_external_data_handler.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/printers_external_data_handler.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/user_avatar_image_external_data_handler.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/wallpaper_image_external_data_handler.h"
#include "chrome/browser/chromeos/policy/networking/device_network_configuration_updater.h"
#include "chrome/browser/chromeos/policy/networking/policy_cert_service_factory.h"
#include "chrome/browser/chromeos/policy/networking/user_network_configuration_updater.h"
diff --git a/chrome/browser/ash/login/users/wallpaper_policy_browsertest.cc b/chrome/browser/ash/login/users/wallpaper_policy_browsertest.cc
index cbb32b1..1d10c1a 100644
--- a/chrome/browser/ash/login/users/wallpaper_policy_browsertest.cc
+++ b/chrome/browser/ash/login/users/wallpaper_policy_browsertest.cc
@@ -32,8 +32,8 @@
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/policy/core/device_policy_builder.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/ash/wallpaper_controller_client_impl.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
diff --git a/chrome/browser/ash/login/wizard_controller.cc b/chrome/browser/ash/login/wizard_controller.cc
index 13e9429..8f3c61f 100644
--- a/chrome/browser/ash/login/wizard_controller.cc
+++ b/chrome/browser/ash/login/wizard_controller.cc
@@ -99,6 +99,7 @@
#include "chrome/browser/ash/login/wizard_context.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_chromeos.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/stats_reporting_controller.h"
#include "chrome/browser/ash/system/device_disabling_manager.h"
@@ -109,7 +110,6 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/multidevice_setup/multidevice_setup_client_factory.h"
#include "chrome/browser/chromeos/net/delay_network_call.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/metrics/metrics_reporting_state.h"
#include "chrome/browser/policy/profile_policy_connector.h"
diff --git a/chrome/browser/ash/login/wizard_controller.h b/chrome/browser/ash/login/wizard_controller.h
index b4e9e11..aa2e5922 100644
--- a/chrome/browser/ash/login/wizard_controller.h
+++ b/chrome/browser/ash/login/wizard_controller.h
@@ -64,7 +64,7 @@
#include "chrome/browser/ash/login/screens/update_screen.h"
#include "chrome/browser/ash/login/screens/user_creation_screen.h"
#include "chrome/browser/ash/login/screens/welcome_screen.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
// TODO(https://crbug.com/1164001): move to forward declaration.
#include "chromeos/geolocation/geoposition.h"
// TODO(https://crbug.com/1164001): move to forward declaration.
diff --git a/chrome/browser/ash/login/wizard_controller_browsertest.cc b/chrome/browser/ash/login/wizard_controller_browsertest.cc
index f7902a2f..765f3319 100644
--- a/chrome/browser/ash/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/ash/login/wizard_controller_browsertest.cc
@@ -57,12 +57,12 @@
#include "chrome/browser/ash/login/test/oobe_screen_waiter.h"
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/ui/webui_login_view.h"
+#include "chrome/browser/ash/policy/enrollment/auto_enrollment_client.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
-#include "chrome/browser/chromeos/policy/enrollment/auto_enrollment_client.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
-#include "chrome/browser/chromeos/policy/enrollment/fake_auto_enrollment_client.h"
#include "chrome/browser/chromeos/policy/server_backed_state/server_backed_device_state.h"
#include "chrome/browser/lifetime/browser_shutdown.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/policy/core/browser_policy_connector_chromeos.cc b/chrome/browser/ash/policy/core/browser_policy_connector_chromeos.cc
index a597646..870669a0 100644
--- a/chrome/browser/ash/policy/core/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/ash/policy/core/browser_policy_connector_chromeos.cc
@@ -31,17 +31,17 @@
#include "chrome/browser/ash/policy/core/device_local_account.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
#include "chrome/browser/ash/policy/core/dm_token_storage.h"
+#include "chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
+#include "chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h"
#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chrome/browser/ash/system/timezone_util.h"
-#include "chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
-#include "chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/device_print_servers_external_data_handler.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/device_printers_external_data_handler.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h"
#include "chrome/browser/chromeos/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h"
#include "chrome/browser/chromeos/policy/handlers/bluetooth_policy_handler.h"
#include "chrome/browser/chromeos/policy/handlers/device_dock_mac_address_source_handler.h"
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/ash/policy/core/device_cloud_policy_manager_chromeos_unittest.cc
index 4d43d35..ab1ae6ee 100644
--- a/chrome/browser/ash/policy/core/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/ash/policy/core/device_cloud_policy_manager_chromeos_unittest.cc
@@ -23,10 +23,10 @@
#include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_store_chromeos.h"
+#include "chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
-#include "chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.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/policy/enrollment_status.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_browsertest.cc b/chrome/browser/ash/policy/core/device_local_account_browsertest.cc
index 2391a78..6fabfe7 100644
--- a/chrome/browser/ash/policy/core/device_local_account_browsertest.cc
+++ b/chrome/browser/ash/policy/core/device_local_account_browsertest.cc
@@ -70,6 +70,7 @@
#include "chrome/browser/ash/policy/core/device_local_account.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/browser_process.h"
@@ -77,7 +78,6 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h"
#include "chrome/browser/chromeos/extensions/external_cache.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/chromeos/policy/networking/device_network_configuration_updater.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_provider.cc b/chrome/browser/ash/policy/core/device_local_account_policy_provider.cc
index 8cc5fb09..ec1b4a61 100644
--- a/chrome/browser/ash/policy/core/device_local_account_policy_provider.cc
+++ b/chrome/browser/ash/policy/core/device_local_account_policy_provider.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/values.h"
#include "chrome/browser/ash/policy/core/device_local_account.h"
-#include "chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.h"
+#include "chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h"
#include "chromeos/dbus/power/power_policy_controller.h"
#include "components/policy/core/common/cloud/cloud_policy_core.h"
#include "components/policy/core/common/cloud/cloud_policy_service.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_provider.h b/chrome/browser/ash/policy/core/device_local_account_policy_provider.h
index 6e48ec4..91e714b 100644
--- a/chrome/browser/ash/policy/core/device_local_account_policy_provider.h
+++ b/chrome/browser/ash/policy/core/device_local_account_policy_provider.h
@@ -13,7 +13,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
-#include "chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.h"
+#include "chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h"
#include "components/policy/core/common/configuration_policy_provider.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_service.cc b/chrome/browser/ash/policy/core/device_local_account_policy_service.cc
index d2070e1..b0aa18f 100644
--- a/chrome/browser/ash/policy/core/device_local_account_policy_service.cc
+++ b/chrome/browser/ash/policy/core/device_local_account_policy_service.cc
@@ -24,8 +24,8 @@
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/ash/policy/core/device_local_account.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_store.h"
+#include "chrome/browser/ash/policy/external_data/device_local_account_external_data_service.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
-#include "chrome/browser/chromeos/policy/external_data/device_local_account_external_data_service.h"
#include "chrome/browser/chromeos/policy/invalidation/affiliated_cloud_policy_invalidator.h"
#include "chrome/common/chrome_content_client.h"
#include "chromeos/dbus/session_manager/session_manager_client.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_service.h b/chrome/browser/ash/policy/core/device_local_account_policy_service.h
index 4e5be8b..6e45ade 100644
--- a/chrome/browser/ash/policy/core/device_local_account_policy_service.h
+++ b/chrome/browser/ash/policy/core/device_local_account_policy_service.h
@@ -18,9 +18,9 @@
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "chrome/browser/ash/policy/core/device_local_account_extension_tracker.h"
+#include "chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h"
#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h"
-#include "chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.h"
#include "components/policy/core/common/cloud/cloud_policy_core.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
#include "components/policy/core/common/cloud/component_cloud_policy_service.h"
diff --git a/chrome/browser/ash/policy/core/user_policy_manager_builder_chromeos.cc b/chrome/browser/ash/policy/core/user_policy_manager_builder_chromeos.cc
index ebca420e..c59a7e6 100644
--- a/chrome/browser/ash/policy/core/user_policy_manager_builder_chromeos.cc
+++ b/chrome/browser/ash/policy/core/user_policy_manager_builder_chromeos.cc
@@ -23,11 +23,11 @@
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_store_chromeos.h"
+#include "chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/policy/schema_registry_service.h"
#include "chrome/common/chrome_features.h"
diff --git a/chrome/browser/chromeos/policy/enrollment/README.md b/chrome/browser/ash/policy/enrollment/README.md
similarity index 75%
rename from chrome/browser/chromeos/policy/enrollment/README.md
rename to chrome/browser/ash/policy/enrollment/README.md
index ee792cd..b39f1af 100644
--- a/chrome/browser/chromeos/policy/enrollment/README.md
+++ b/chrome/browser/ash/policy/enrollment/README.md
@@ -1,4 +1,4 @@
-chrome/browser/chromeos/policy/enrollment
+chrome/browser/ash/policy/enrollment
=========================================
This directory should contain code related to device enrollment and
diff --git a/chrome/browser/chromeos/policy/enrollment/account_status_check_fetcher.cc b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc
similarity index 99%
rename from chrome/browser/chromeos/policy/enrollment/account_status_check_fetcher.cc
rename to chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc
index 16d4280..0f788c3 100644
--- a/chrome/browser/chromeos/policy/enrollment/account_status_check_fetcher.cc
+++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.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/policy/enrollment/account_status_check_fetcher.h"
+#include "chrome/browser/ash/policy/enrollment/account_status_check_fetcher.h"
#include <string>
#include <utility>
diff --git a/chrome/browser/chromeos/policy/enrollment/account_status_check_fetcher.h b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.h
similarity index 92%
rename from chrome/browser/chromeos/policy/enrollment/account_status_check_fetcher.h
rename to chrome/browser/ash/policy/enrollment/account_status_check_fetcher.h
index baa32f6..ca63eab 100644
--- a/chrome/browser/chromeos/policy/enrollment/account_status_check_fetcher.h
+++ b/chrome/browser/ash/policy/enrollment/account_status_check_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_CHROMEOS_POLICY_ENROLLMENT_ACCOUNT_STATUS_CHECK_FETCHER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_ACCOUNT_STATUS_CHECK_FETCHER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ACCOUNT_STATUS_CHECK_FETCHER_H_
+#define CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ACCOUNT_STATUS_CHECK_FETCHER_H_
#include <memory>
#include <string>
@@ -89,4 +89,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_ACCOUNT_STATUS_CHECK_FETCHER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ACCOUNT_STATUS_CHECK_FETCHER_H_
diff --git a/chrome/browser/chromeos/policy/enrollment/account_status_check_fetcher_unittest.cc b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/policy/enrollment/account_status_check_fetcher_unittest.cc
rename to chrome/browser/ash/policy/enrollment/account_status_check_fetcher_unittest.cc
index e5cecbe..2233879 100644
--- a/chrome/browser/chromeos/policy/enrollment/account_status_check_fetcher_unittest.cc
+++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher_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/policy/enrollment/account_status_check_fetcher.h"
+#include "chrome/browser/ash/policy/enrollment/account_status_check_fetcher.h"
#include <memory>
#include <string>
diff --git a/chrome/browser/chromeos/policy/enrollment/auto_enrollment_client.h b/chrome/browser/ash/policy/enrollment/auto_enrollment_client.h
similarity index 95%
rename from chrome/browser/chromeos/policy/enrollment/auto_enrollment_client.h
rename to chrome/browser/ash/policy/enrollment/auto_enrollment_client.h
index aed1f0e..5fd8ac8 100644
--- a/chrome/browser/chromeos/policy/enrollment/auto_enrollment_client.h
+++ b/chrome/browser/ash/policy/enrollment/auto_enrollment_client.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_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_H_
+#define CHROME_BROWSER_ASH_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_H_
#include <memory>
#include <string>
@@ -123,4 +123,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_H_
+#endif // CHROME_BROWSER_ASH_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_H_
diff --git a/chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl.cc b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.cc
similarity index 99%
rename from chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl.cc
rename to chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.cc
index 98520e1..c27556bb 100644
--- a/chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl.cc
+++ b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.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/policy/enrollment/auto_enrollment_client_impl.h"
+#include "chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.h"
#include <stdint.h>
diff --git a/chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl.h b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.h
similarity index 97%
rename from chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl.h
rename to chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.h
index 91ce40d..d7a4793 100644
--- a/chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl.h
+++ b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.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_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_IMPL_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_IMPL_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_IMPL_H_
+#define CHROME_BROWSER_ASH_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_IMPL_H_
#include <memory>
#include <string>
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/policy/enrollment/auto_enrollment_client.h"
+#include "chrome/browser/ash/policy/enrollment/auto_enrollment_client.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "components/policy/core/common/cloud/device_management_service.h"
#include "services/network/public/cpp/network_connection_tracker.h"
@@ -321,4 +321,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_IMPL_H_
+#endif // CHROME_BROWSER_ASH_POLICY_ENROLLMENT_AUTO_ENROLLMENT_CLIENT_IMPL_H_
diff --git a/chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl_unittest.cc b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl_unittest.cc
rename to chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl_unittest.cc
index da91e46..d6ef09e4 100644
--- a/chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl_unittest.cc
+++ b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl_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/policy/enrollment/auto_enrollment_client_impl.h"
+#include "chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.h"
#include <stdint.h>
diff --git a/chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.cc b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.cc
similarity index 97%
rename from chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.cc
rename to chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.cc
index 44c0b05a..f6241e2 100644
--- a/chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.cc
+++ b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.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/policy/enrollment/device_cloud_policy_initializer.h"
+#include "chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h"
#include <memory>
#include <utility>
@@ -19,10 +19,10 @@
#include "chrome/browser/ash/login/login_pref_names.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_store_chromeos.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_handler_chromeos.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_handler_chromeos.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/chromeos/policy/server_backed_state/server_backed_device_state.h"
#include "chrome/browser/chromeos/policy/status_collector/device_status_collector.h"
#include "chrome/browser/net/system_network_context_manager.h"
diff --git a/chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h
similarity index 96%
rename from chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h
rename to chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h
index 562a2ed..0c2924f 100644
--- a/chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h
+++ b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.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_POLICY_ENROLLMENT_DEVICE_CLOUD_POLICY_INITIALIZER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_DEVICE_CLOUD_POLICY_INITIALIZER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_ENROLLMENT_DEVICE_CLOUD_POLICY_INITIALIZER_H_
+#define CHROME_BROWSER_ASH_POLICY_ENROLLMENT_DEVICE_CLOUD_POLICY_INITIALIZER_H_
#include <map>
#include <memory>
@@ -217,4 +217,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_DEVICE_CLOUD_POLICY_INITIALIZER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_ENROLLMENT_DEVICE_CLOUD_POLICY_INITIALIZER_H_
diff --git a/chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer_unittest.cc b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer_unittest.cc
rename to chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer_unittest.cc
index 92dec4a..4d15df12 100644
--- a/chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer_unittest.cc
+++ b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer_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/policy/enrollment/device_cloud_policy_initializer.h"
+#include "chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h"
#include "ash/constants/ash_switches.h"
#include "base/command_line.h"
@@ -10,7 +10,7 @@
#include "base/test/task_environment.h"
#include "base/values.h"
#include "chrome/browser/ash/login/login_pref_names.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/chromeos/policy/server_backed_state/server_backed_device_state.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/common/pref_names.h"
diff --git a/chrome/browser/chromeos/policy/enrollment/enrollment_config.cc b/chrome/browser/ash/policy/enrollment/enrollment_config.cc
similarity index 83%
rename from chrome/browser/chromeos/policy/enrollment/enrollment_config.cc
rename to chrome/browser/ash/policy/enrollment/enrollment_config.cc
index a935f05..538ed45 100644
--- a/chrome/browser/chromeos/policy/enrollment/enrollment_config.cc
+++ b/chrome/browser/ash/policy/enrollment/enrollment_config.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/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
namespace policy {
diff --git a/chrome/browser/chromeos/policy/enrollment/enrollment_config.h b/chrome/browser/ash/policy/enrollment/enrollment_config.h
similarity index 96%
rename from chrome/browser/chromeos/policy/enrollment/enrollment_config.h
rename to chrome/browser/ash/policy/enrollment/enrollment_config.h
index 65bdd1a..7347191 100644
--- a/chrome/browser/chromeos/policy/enrollment/enrollment_config.h
+++ b/chrome/browser/ash/policy/enrollment/enrollment_config.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_POLICY_ENROLLMENT_ENROLLMENT_CONFIG_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_ENROLLMENT_CONFIG_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ENROLLMENT_CONFIG_H_
+#define CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ENROLLMENT_CONFIG_H_
#include <string>
@@ -179,4 +179,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_ENROLLMENT_CONFIG_H_
+#endif // CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ENROLLMENT_CONFIG_H_
diff --git a/chrome/browser/chromeos/policy/enrollment/enrollment_handler_chromeos.cc b/chrome/browser/ash/policy/enrollment/enrollment_handler_chromeos.cc
similarity index 99%
rename from chrome/browser/chromeos/policy/enrollment/enrollment_handler_chromeos.cc
rename to chrome/browser/ash/policy/enrollment/enrollment_handler_chromeos.cc
index 6078673..eb94d31 100644
--- a/chrome/browser/chromeos/policy/enrollment/enrollment_handler_chromeos.cc
+++ b/chrome/browser/ash/policy/enrollment/enrollment_handler_chromeos.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/policy/enrollment/enrollment_handler_chromeos.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_handler_chromeos.h"
#include <utility>
diff --git a/chrome/browser/chromeos/policy/enrollment/enrollment_handler_chromeos.h b/chrome/browser/ash/policy/enrollment/enrollment_handler_chromeos.h
similarity index 95%
rename from chrome/browser/chromeos/policy/enrollment/enrollment_handler_chromeos.h
rename to chrome/browser/ash/policy/enrollment/enrollment_handler_chromeos.h
index 47447837..103050b 100644
--- a/chrome/browser/chromeos/policy/enrollment/enrollment_handler_chromeos.h
+++ b/chrome/browser/ash/policy/enrollment/enrollment_handler_chromeos.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_POLICY_ENROLLMENT_ENROLLMENT_HANDLER_CHROMEOS_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_ENROLLMENT_HANDLER_CHROMEOS_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ENROLLMENT_HANDLER_CHROMEOS_H_
+#define CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ENROLLMENT_HANDLER_CHROMEOS_H_
#include <memory>
#include <string>
@@ -13,8 +13,8 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_validator.h"
-#include "chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/policy/device_account_initializer.h"
#include "chromeos/dbus/authpolicy/authpolicy_client.h"
#include "chromeos/dbus/constants/attestation_constants.h"
@@ -249,4 +249,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_ENROLLMENT_HANDLER_CHROMEOS_H_
+#endif // CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ENROLLMENT_HANDLER_CHROMEOS_H_
diff --git a/chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.cc b/chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.cc
similarity index 98%
rename from chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.cc
rename to chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.cc
index 491fa75..ed652cf 100644
--- a/chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.cc
+++ b/chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.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/policy/enrollment/enrollment_requisition_manager.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "base/logging.h"
#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
diff --git a/chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h b/chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h
similarity index 85%
rename from chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h
rename to chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h
index 8466fca..8c47e0d 100644
--- a/chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h
+++ b/chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.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_POLICY_ENROLLMENT_ENROLLMENT_REQUISITION_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_ENROLLMENT_REQUISITION_MANAGER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ENROLLMENT_REQUISITION_MANAGER_H_
+#define CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ENROLLMENT_REQUISITION_MANAGER_H_
#include <string>
@@ -49,4 +49,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_ENROLLMENT_REQUISITION_MANAGER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_ENROLLMENT_ENROLLMENT_REQUISITION_MANAGER_H_
diff --git a/chrome/browser/chromeos/policy/enrollment/fake_auto_enrollment_client.cc b/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.cc
similarity index 96%
rename from chrome/browser/chromeos/policy/enrollment/fake_auto_enrollment_client.cc
rename to chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.cc
index 4c849fb..974c8886 100644
--- a/chrome/browser/chromeos/policy/enrollment/fake_auto_enrollment_client.cc
+++ b/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.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/policy/enrollment/fake_auto_enrollment_client.h"
+#include "chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/chrome/browser/chromeos/policy/enrollment/fake_auto_enrollment_client.h b/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h
similarity index 89%
rename from chrome/browser/chromeos/policy/enrollment/fake_auto_enrollment_client.h
rename to chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h
index fd27f894..403fb45 100644
--- a/chrome/browser/chromeos/policy/enrollment/fake_auto_enrollment_client.h
+++ b/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_FAKE_AUTO_ENROLLMENT_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_FAKE_AUTO_ENROLLMENT_CLIENT_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_ENROLLMENT_FAKE_AUTO_ENROLLMENT_CLIENT_H_
+#define CHROME_BROWSER_ASH_POLICY_ENROLLMENT_FAKE_AUTO_ENROLLMENT_CLIENT_H_
#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "chrome/browser/chromeos/policy/enrollment/auto_enrollment_client.h"
+#include "chrome/browser/ash/policy/enrollment/auto_enrollment_client.h"
class PrefService;
@@ -84,4 +84,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_FAKE_AUTO_ENROLLMENT_CLIENT_H_
+#endif // CHROME_BROWSER_ASH_POLICY_ENROLLMENT_FAKE_AUTO_ENROLLMENT_CLIENT_H_
diff --git a/chrome/browser/chromeos/policy/enrollment/fake_device_cloud_policy_initializer.cc b/chrome/browser/ash/policy/enrollment/fake_device_cloud_policy_initializer.cc
similarity index 95%
rename from chrome/browser/chromeos/policy/enrollment/fake_device_cloud_policy_initializer.cc
rename to chrome/browser/ash/policy/enrollment/fake_device_cloud_policy_initializer.cc
index d0e831db..30785759 100644
--- a/chrome/browser/chromeos/policy/enrollment/fake_device_cloud_policy_initializer.cc
+++ b/chrome/browser/ash/policy/enrollment/fake_device_cloud_policy_initializer.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/policy/enrollment/fake_device_cloud_policy_initializer.h"
+#include "chrome/browser/ash/policy/enrollment/fake_device_cloud_policy_initializer.h"
#include <memory>
diff --git a/chrome/browser/chromeos/policy/enrollment/fake_device_cloud_policy_initializer.h b/chrome/browser/ash/policy/enrollment/fake_device_cloud_policy_initializer.h
similarity index 80%
rename from chrome/browser/chromeos/policy/enrollment/fake_device_cloud_policy_initializer.h
rename to chrome/browser/ash/policy/enrollment/fake_device_cloud_policy_initializer.h
index 5c68b38..f073122c 100644
--- a/chrome/browser/chromeos/policy/enrollment/fake_device_cloud_policy_initializer.h
+++ b/chrome/browser/ash/policy/enrollment/fake_device_cloud_policy_initializer.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_CHROMEOS_POLICY_ENROLLMENT_FAKE_DEVICE_CLOUD_POLICY_INITIALIZER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_FAKE_DEVICE_CLOUD_POLICY_INITIALIZER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_ENROLLMENT_FAKE_DEVICE_CLOUD_POLICY_INITIALIZER_H_
+#define CHROME_BROWSER_ASH_POLICY_ENROLLMENT_FAKE_DEVICE_CLOUD_POLICY_INITIALIZER_H_
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h"
+#include "chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h"
#include "chrome/browser/policy/enrollment_status.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "components/policy/core/common/cloud/dm_auth.h"
@@ -50,4 +50,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_FAKE_DEVICE_CLOUD_POLICY_INITIALIZER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_ENROLLMENT_FAKE_DEVICE_CLOUD_POLICY_INITIALIZER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/README.md b/chrome/browser/ash/policy/external_data/README.md
similarity index 94%
rename from chrome/browser/chromeos/policy/external_data/README.md
rename to chrome/browser/ash/policy/external_data/README.md
index 459929e..17aa95a 100644
--- a/chrome/browser/chromeos/policy/external_data/README.md
+++ b/chrome/browser/ash/policy/external_data/README.md
@@ -1,4 +1,4 @@
-chrome/browser/chromeos/policy/external_data
+chrome/browser/ash/policy/external_data
============================================
This directory should contain code that handles policies which rely on external
diff --git a/chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.cc
similarity index 99%
rename from chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.cc
rename to chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.cc
index 5283a39e5..e3cf336 100644
--- a/chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.cc
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.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/policy/external_data/cloud_external_data_manager_base.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h"
#include <stddef.h>
#include <stdint.h>
diff --git a/chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.h b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h
similarity index 91%
rename from chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.h
rename to chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h
index 1405ce9d..172d278 100644
--- a/chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.h
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.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_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_H_
#include <memory>
@@ -84,4 +84,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_H_
diff --git a/chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.cc
similarity index 96%
rename from chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.cc
rename to chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.cc
index ef3516dce..c8af9bb4 100644
--- a/chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.cc
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_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/policy/external_data/cloud_external_data_manager_base_test_util.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include <utility>
diff --git a/chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h
similarity index 86%
rename from chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h
rename to chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h
index e5ce791..06f4040c 100644
--- a/chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_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_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_TEST_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_TEST_UTIL_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_TEST_UTIL_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_TEST_UTIL_H_
#include <memory>
#include <string>
@@ -59,4 +59,4 @@
} // namespace test
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_TEST_UTIL_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_MANAGER_BASE_TEST_UTIL_H_
diff --git a/chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_unittest.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_unittest.cc
rename to chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_unittest.cc
index f1cafa0..8c02661 100644
--- a/chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_unittest.cc
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_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/policy/external_data/cloud_external_data_manager_base.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h"
#include <map>
#include <memory>
diff --git a/chrome/browser/chromeos/policy/external_data/cloud_external_data_policy_observer.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc
similarity index 98%
rename from chrome/browser/chromeos/policy/external_data/cloud_external_data_policy_observer.cc
rename to chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc
index 8f5b789..d6cf319 100644
--- a/chrome/browser/chromeos/policy/external_data/cloud_external_data_policy_observer.cc
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.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/policy/external_data/cloud_external_data_policy_observer.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.h"
#include <memory>
#include <set>
diff --git a/chrome/browser/chromeos/policy/external_data/cloud_external_data_policy_observer.h b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.h
similarity index 94%
rename from chrome/browser/chromeos/policy/external_data/cloud_external_data_policy_observer.h
rename to chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.h
index b9e4c37..3f7dda04 100644
--- a/chrome/browser/chromeos/policy/external_data/cloud_external_data_policy_observer.h
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.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_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
#include <map>
#include <memory>
@@ -134,4 +134,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/policy/external_data/cloud_external_data_policy_observer_unittest.cc
rename to chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
index b8e5c42..08d5ee9 100644
--- a/chrome/browser/chromeos/policy/external_data/cloud_external_data_policy_observer_unittest.cc
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_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/policy/external_data/cloud_external_data_policy_observer.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.h"
#include <memory>
#include <utility>
@@ -21,11 +21,11 @@
#include "chrome/browser/ash/policy/core/device_local_account.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_provider.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
+#include "chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h"
-#include "chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.h"
#include "chrome/browser/chromeos/policy/invalidation/fake_affiliated_invalidation_service_provider.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/chromeos/policy/external_data/device_cloud_external_data_policy_observer.cc b/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.cc
similarity index 96%
rename from chrome/browser/chromeos/policy/external_data/device_cloud_external_data_policy_observer.cc
rename to chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.cc
index 4c7c9f0..28c039f 100644
--- a/chrome/browser/chromeos/policy/external_data/device_cloud_external_data_policy_observer.cc
+++ b/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.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/policy/external_data/device_cloud_external_data_policy_observer.h"
+#include "chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.h"
#include "base/bind.h"
#include "components/policy/core/common/external_data_fetcher.h"
diff --git a/chrome/browser/chromeos/policy/external_data/device_cloud_external_data_policy_observer.h b/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.h
similarity index 91%
rename from chrome/browser/chromeos/policy/external_data/device_cloud_external_data_policy_observer.h
rename to chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.h
index 2302b92..9b2051c 100644
--- a/chrome/browser/chromeos/policy/external_data/device_cloud_external_data_policy_observer.h
+++ b/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.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_POLICY_EXTERNAL_DATA_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
#include <memory>
#include <string>
@@ -86,4 +86,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_OBSERVER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/device_cloud_external_data_policy_observer_browsertest.cc b/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer_browsertest.cc
similarity index 97%
rename from chrome/browser/chromeos/policy/external_data/device_cloud_external_data_policy_observer_browsertest.cc
rename to chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer_browsertest.cc
index 0c0fb34..a6eff70 100644
--- a/chrome/browser/chromeos/policy/external_data/device_cloud_external_data_policy_observer_browsertest.cc
+++ b/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer_browsertest.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/policy/external_data/device_cloud_external_data_policy_observer.h"
+#include "chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.h"
#include <memory>
#include <string>
@@ -13,9 +13,9 @@
#include "base/path_service.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/common/chrome_paths.h"
#include "chromeos/settings/cros_settings_names.h"
#include "components/policy/core/common/policy_service.h"
diff --git a/chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.cc b/chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.cc
similarity index 86%
rename from chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.cc
rename to chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.cc
index 966459d22..4649d3c 100644
--- a/chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.cc
+++ b/chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.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/chromeos/policy/external_data/device_local_account_external_data_manager.h"
+#include "chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h"
#include <memory>
#include "base/sequenced_task_runner.h"
-#include "chrome/browser/chromeos/policy/external_data/device_local_account_external_data_service.h"
+#include "chrome/browser/ash/policy/external_data/device_local_account_external_data_service.h"
#include "components/policy/core/common/cloud/cloud_external_data_store.h"
#include "components/policy/core/common/cloud/resource_cache.h"
#include "components/policy/policy_constants.h"
diff --git a/chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.h b/chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h
similarity index 86%
rename from chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.h
rename to chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h
index 65a2c4f..c551958 100644
--- a/chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.h
+++ b/chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_MANAGER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_MANAGER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_MANAGER_H_
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h"
#include "components/policy/core/common/policy_details.h"
namespace base {
@@ -63,4 +63,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_MANAGER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_MANAGER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/device_local_account_external_data_service.cc b/chrome/browser/ash/policy/external_data/device_local_account_external_data_service.cc
similarity index 96%
rename from chrome/browser/chromeos/policy/external_data/device_local_account_external_data_service.cc
rename to chrome/browser/ash/policy/external_data/device_local_account_external_data_service.cc
index 0f8eb0e..b4572d76 100644
--- a/chrome/browser/chromeos/policy/external_data/device_local_account_external_data_service.cc
+++ b/chrome/browser/ash/policy/external_data/device_local_account_external_data_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/policy/external_data/device_local_account_external_data_service.h"
+#include "chrome/browser/ash/policy/external_data/device_local_account_external_data_service.h"
#include <memory>
#include <set>
diff --git a/chrome/browser/chromeos/policy/external_data/device_local_account_external_data_service.h b/chrome/browser/ash/policy/external_data/device_local_account_external_data_service.h
similarity index 81%
rename from chrome/browser/chromeos/policy/external_data/device_local_account_external_data_service.h
rename to chrome/browser/ash/policy/external_data/device_local_account_external_data_service.h
index eb877cd..179655ce 100644
--- a/chrome/browser/chromeos/policy/external_data/device_local_account_external_data_service.h
+++ b/chrome/browser/ash/policy/external_data/device_local_account_external_data_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_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_SERVICE_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_SERVICE_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_SERVICE_H_
#include <map>
#include <memory>
@@ -13,7 +13,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
-#include "chrome/browser/chromeos/policy/external_data/device_local_account_external_data_manager.h"
+#include "chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h"
#include "components/policy/core/common/cloud/resource_cache.h"
namespace base {
@@ -58,4 +58,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_SERVICE_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA_SERVICE_H_
diff --git a/chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager.cc b/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.cc
similarity index 95%
rename from chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager.cc
rename to chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.cc
index ea924c6..cb347d12 100644
--- a/chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager.cc
+++ b/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.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/policy/external_data/device_policy_cloud_external_data_manager.h"
+#include "chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.h"
#include <stdint.h>
#include <utility>
diff --git a/chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager.h b/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.h
similarity index 81%
rename from chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager.h
rename to chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.h
index 897e2a0..7109e1a 100644
--- a/chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager.h
+++ b/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_DEVICE_POLICY_CLOUD_EXTERNAL_DATA_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_DEVICE_POLICY_CLOUD_EXTERNAL_DATA_MANAGER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_POLICY_CLOUD_EXTERNAL_DATA_MANAGER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_POLICY_CLOUD_EXTERNAL_DATA_MANAGER_H_
#include <memory>
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/memory/scoped_refptr.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h"
#include "components/policy/core/common/policy_details.h"
namespace base {
@@ -52,4 +52,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_DEVICE_POLICY_CLOUD_EXTERNAL_DATA_MANAGER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_DEVICE_POLICY_CLOUD_EXTERNAL_DATA_MANAGER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc b/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc
similarity index 96%
rename from chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc
rename to chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc
index c0d1581..3f15952 100644
--- a/chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc
+++ b/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc
@@ -18,11 +18,11 @@
#include "base/values.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
+#include "chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h"
-#include "chrome/browser/chromeos/policy/external_data/device_policy_cloud_external_data_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.cc b/chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.cc
similarity index 85%
rename from chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.cc
index 1cb339c..bc6536ee 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.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/policy/external_data/handlers/cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.h"
#include "components/user_manager/known_user.h"
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.h b/chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.h
similarity index 62%
rename from chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.h
rename to chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.h
index 8c80ce2..0325c5d 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.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_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_policy_observer.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.h"
namespace policy {
@@ -26,4 +26,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc
similarity index 95%
rename from chrome/browser/chromeos/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc
index 02f7a52..771d714 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.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/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h"
#include "chrome/browser/ash/crostini/crostini_pref_names.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h
similarity index 74%
rename from chrome/browser/chromeos/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h
rename to chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h
index 0b07d3f..c2efbda 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.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_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_CROSTINI_ANSIBLE_PLAYBOOK_EXTERNAL_DATA_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_CROSTINI_ANSIBLE_PLAYBOOK_EXTERNAL_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_CROSTINI_ANSIBLE_PLAYBOOK_EXTERNAL_DATA_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_CROSTINI_ANSIBLE_PLAYBOOK_EXTERNAL_DATA_HANDLER_H_
#include <memory>
#include <string>
-#include "chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.h"
namespace ash {
class CrosSettings;
@@ -43,4 +43,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_CROSTINI_ANSIBLE_PLAYBOOK_EXTERNAL_DATA_HANDLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_CROSTINI_ANSIBLE_PLAYBOOK_EXTERNAL_DATA_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_cloud_external_data_policy_handler.cc b/chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.cc
similarity index 73%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_cloud_external_data_policy_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.cc
index 6d24c3ae..e56ce272 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_cloud_external_data_policy_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.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/policy/external_data/handlers/device_cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.h b/chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.h
new file mode 100644
index 0000000..df6f6de
--- /dev/null
+++ b/chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.h
@@ -0,0 +1,27 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// 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_EXTERNAL_DATA_HANDLERS_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
+
+#include "chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.h"
+
+namespace policy {
+
+// Base class for handling per-device external resources like wallpaper or
+// printers configuration.
+class DeviceCloudExternalDataPolicyHandler
+ : public DeviceCloudExternalDataPolicyObserver::Delegate {
+ public:
+ DeviceCloudExternalDataPolicyHandler();
+
+ virtual void Shutdown() = 0;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(DeviceCloudExternalDataPolicyHandler);
+};
+
+} // namespace policy
+
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_print_servers_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler.cc
similarity index 93%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_print_servers_external_data_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler.cc
index e09942c..4ba8ea0 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_print_servers_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler.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/policy/external_data/handlers/device_print_servers_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler.h"
#include <utility>
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_print_servers_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler.h
similarity index 76%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_print_servers_external_data_handler.h
rename to chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler.h
index c8f51fbb..25672b3d 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_print_servers_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler.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_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
#include <memory>
#include <string>
#include "base/files/file_path.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/device_cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.h"
namespace policy {
@@ -42,4 +42,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_print_servers_external_data_handler_unittest.cc b/chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler_unittest.cc
similarity index 97%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_print_servers_external_data_handler_unittest.cc
rename to chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler_unittest.cc
index 1bef167..ad175bf 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_print_servers_external_data_handler_unittest.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler_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/policy/external_data/handlers/device_print_servers_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_print_servers_external_data_handler.h"
#include <memory>
#include <string>
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_printers_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.cc
similarity index 93%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_printers_external_data_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.cc
index 8405932..e4d936a 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_printers_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.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/policy/external_data/handlers/device_printers_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.h"
#include <utility>
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_printers_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.h
similarity index 75%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_printers_external_data_handler.h
rename to chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.h
index 14f2ae3..b9ddbc6 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_printers_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.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_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
#include <memory>
#include <string>
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/device_cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.h"
namespace chromeos {
class BulkPrintersCalculator;
@@ -46,4 +46,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_PRINTERS_EXTERNAL_DATA_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_printers_external_data_handler_unittest.cc b/chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler_unittest.cc
similarity index 97%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_printers_external_data_handler_unittest.cc
rename to chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler_unittest.cc
index a8b7cbeb..815b5713 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_printers_external_data_handler_unittest.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler_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/policy/external_data/handlers/device_printers_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_printers_external_data_handler.h"
#include <memory>
#include <string>
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_wallpaper_image_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.cc
similarity index 93%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_wallpaper_image_external_data_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.cc
index 0e81569..dfb344e 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_wallpaper_image_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.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/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h"
#include <utility>
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h
similarity index 76%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h
rename to chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h
index a083b63..8dd50c9 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.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_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
#include <memory>
#include <string>
#include "base/macros.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/device_cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.h"
class PrefRegistrySimple;
class PrefService;
@@ -48,4 +48,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.cc
similarity index 93%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.cc
index e8dcf6e3..ff39390 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.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/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h"
#include "chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h"
#include "components/policy/policy_constants.h"
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h
similarity index 73%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h
rename to chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h
index 027c82b0..da1dbdf 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.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_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WILCO_DTC_CONFIGURATION_EXTERNAL_DATA_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WILCO_DTC_CONFIGURATION_EXTERNAL_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WILCO_DTC_CONFIGURATION_EXTERNAL_DATA_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WILCO_DTC_CONFIGURATION_EXTERNAL_DATA_HANDLER_H_
#include <memory>
#include <string>
#include "base/macros.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/device_cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.h"
namespace policy {
@@ -41,4 +41,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WILCO_DTC_CONFIGURATION_EXTERNAL_DATA_HANDLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_WILCO_DTC_CONFIGURATION_EXTERNAL_DATA_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc b/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc
similarity index 97%
rename from chrome/browser/chromeos/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc
rename to chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc
index 0fc921ab..dd7073f 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc
@@ -13,10 +13,10 @@
#include "base/test/scoped_feature_list.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
#include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/common/chrome_features.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "components/policy/core/common/external_data_fetcher.h"
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/print_servers_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.cc
similarity index 94%
rename from chrome/browser/chromeos/policy/external_data/handlers/print_servers_external_data_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.cc
index 11293a2..3284c190 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/print_servers_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.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/policy/external_data/handlers/print_servers_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.h"
#include <utility>
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/print_servers_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.h
similarity index 78%
rename from chrome/browser/chromeos/policy/external_data/handlers/print_servers_external_data_handler.h
rename to chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.h
index 8d37dc0..b800489 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/print_servers_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/print_servers_external_data_handler.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_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
#include <memory>
#include <string>
-#include "chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.h"
namespace ash {
class CrosSettings;
@@ -46,4 +46,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_PRINT_SERVERS_EXTERNAL_DATA_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/printers_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.cc
similarity index 95%
rename from chrome/browser/chromeos/policy/external_data/handlers/printers_external_data_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.cc
index bbd7c3b..943f26c 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/printers_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.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/policy/external_data/handlers/printers_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.h"
#include <utility>
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/printers_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.h
similarity index 78%
rename from chrome/browser/chromeos/policy/external_data/handlers/printers_external_data_handler.h
rename to chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.h
index e1cf011c..4280a27 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/printers_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/printers_external_data_handler.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_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_PRINTERS_EXTERNAL_DATA_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_PRINTERS_EXTERNAL_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_PRINTERS_EXTERNAL_DATA_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_PRINTERS_EXTERNAL_DATA_HANDLER_H_
#include <memory>
#include <string>
-#include "chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.h"
namespace ash {
class CrosSettings;
@@ -45,4 +45,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_PRINTERS_EXTERNAL_DATA_HANDLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_PRINTERS_EXTERNAL_DATA_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/user_avatar_image_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.cc
similarity index 94%
rename from chrome/browser/chromeos/policy/external_data/handlers/user_avatar_image_external_data_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.cc
index c3ed965..b322479 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/user_avatar_image_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.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/policy/external_data/handlers/user_avatar_image_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.h"
#include <utility>
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/user_avatar_image_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.h
similarity index 76%
rename from chrome/browser/chromeos/policy/external_data/handlers/user_avatar_image_external_data_handler.h
rename to chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.h
index 5cc0462..a7d67789 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/user_avatar_image_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/user_avatar_image_external_data_handler.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_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_USER_AVATAR_IMAGE_EXTERNAL_DATA_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_USER_AVATAR_IMAGE_EXTERNAL_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_USER_AVATAR_IMAGE_EXTERNAL_DATA_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_USER_AVATAR_IMAGE_EXTERNAL_DATA_HANDLER_H_
#include <memory>
#include <string>
-#include "chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.h"
namespace ash {
class CrosSettings;
@@ -45,4 +45,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_USER_AVATAR_IMAGE_EXTERNAL_DATA_HANDLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_USER_AVATAR_IMAGE_EXTERNAL_DATA_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/wallpaper_image_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.cc
similarity index 93%
rename from chrome/browser/chromeos/policy/external_data/handlers/wallpaper_image_external_data_handler.cc
rename to chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.cc
index 233a9c3..84ca553 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/wallpaper_image_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.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/policy/external_data/handlers/wallpaper_image_external_data_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.h"
#include <utility>
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/wallpaper_image_external_data_handler.h b/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.h
similarity index 74%
rename from chrome/browser/chromeos/policy/external_data/handlers/wallpaper_image_external_data_handler.h
rename to chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.h
index 3015145..a105ca5 100644
--- a/chrome/browser/chromeos/policy/external_data/handlers/wallpaper_image_external_data_handler.h
+++ b/chrome/browser/ash/policy/external_data/handlers/wallpaper_image_external_data_handler.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_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
#include <memory>
#include <string>
-#include "chrome/browser/chromeos/policy/external_data/handlers/cloud_external_data_policy_handler.h"
+#include "chrome/browser/ash/policy/external_data/handlers/cloud_external_data_policy_handler.h"
namespace ash {
class CrosSettings;
@@ -43,4 +43,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_HANDLERS_WALLPAPER_IMAGE_EXTERNAL_DATA_HANDLER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager.cc b/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.cc
similarity index 93%
rename from chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager.cc
rename to chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.cc
index 5e848a7..8294735 100644
--- a/chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager.cc
+++ b/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.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/policy/external_data/user_cloud_external_data_manager.h"
+#include "chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.h"
#include <memory>
diff --git a/chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager.h b/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.h
similarity index 87%
rename from chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager.h
rename to chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.h
index d8afa94b..b9f185e 100644
--- a/chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager.h
+++ b/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager.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_CHROMEOS_POLICY_EXTERNAL_DATA_USER_CLOUD_EXTERNAL_DATA_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_USER_CLOUD_EXTERNAL_DATA_MANAGER_H_
+#ifndef CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_USER_CLOUD_EXTERNAL_DATA_MANAGER_H_
+#define CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_USER_CLOUD_EXTERNAL_DATA_MANAGER_H_
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h"
#include "components/policy/core/common/policy_details.h"
namespace base {
@@ -63,4 +63,4 @@
} // namespace policy
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_USER_CLOUD_EXTERNAL_DATA_MANAGER_H_
+#endif // CHROME_BROWSER_ASH_POLICY_EXTERNAL_DATA_USER_CLOUD_EXTERNAL_DATA_MANAGER_H_
diff --git a/chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager_browsertest.cc b/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager_browsertest.cc
similarity index 95%
rename from chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager_browsertest.cc
rename to chrome/browser/ash/policy/external_data/user_cloud_external_data_manager_browsertest.cc
index 8d20a3bfc..b44cec7 100644
--- a/chrome/browser/chromeos/policy/external_data/user_cloud_external_data_manager_browsertest.cc
+++ b/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager_browsertest.cc
@@ -16,8 +16,8 @@
#include "build/build_config.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/core/user_policy_test_helper.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base.h"
-#include "chrome/browser/chromeos/policy/external_data/cloud_external_data_manager_base_test_util.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.h"
+#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/chromeos/policy/login/login_policy_test_base.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/system/input_device_settings.cc b/chrome/browser/ash/system/input_device_settings.cc
index 32ec8ca..d2e5329 100644
--- a/chrome/browser/ash/system/input_device_settings.cc
+++ b/chrome/browser/ash/system/input_device_settings.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ash/system/input_device_settings.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chromeos/system/statistics_provider.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index e8169c8..aea88e78 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -2007,6 +2007,57 @@
"../ash/policy/dlp/dlp_rules_manager_impl.h",
"../ash/policy/dlp/dlp_window_observer.cc",
"../ash/policy/dlp/dlp_window_observer.h",
+ "../ash/policy/enrollment/account_status_check_fetcher.cc",
+ "../ash/policy/enrollment/account_status_check_fetcher.h",
+ "../ash/policy/enrollment/auto_enrollment_client.h",
+ "../ash/policy/enrollment/auto_enrollment_client_impl.cc",
+ "../ash/policy/enrollment/auto_enrollment_client_impl.h",
+ "../ash/policy/enrollment/device_cloud_policy_initializer.cc",
+ "../ash/policy/enrollment/device_cloud_policy_initializer.h",
+ "../ash/policy/enrollment/enrollment_config.cc",
+ "../ash/policy/enrollment/enrollment_config.h",
+ "../ash/policy/enrollment/enrollment_handler_chromeos.cc",
+ "../ash/policy/enrollment/enrollment_handler_chromeos.h",
+ "../ash/policy/enrollment/enrollment_requisition_manager.cc",
+ "../ash/policy/enrollment/enrollment_requisition_manager.h",
+ "../ash/policy/enrollment/fake_auto_enrollment_client.cc",
+ "../ash/policy/enrollment/fake_auto_enrollment_client.h",
+ "../ash/policy/external_data/cloud_external_data_manager_base.cc",
+ "../ash/policy/external_data/cloud_external_data_manager_base.h",
+ "../ash/policy/external_data/cloud_external_data_policy_observer.cc",
+ "../ash/policy/external_data/cloud_external_data_policy_observer.h",
+ "../ash/policy/external_data/device_cloud_external_data_policy_observer.cc",
+ "../ash/policy/external_data/device_cloud_external_data_policy_observer.h",
+ "../ash/policy/external_data/device_local_account_external_data_manager.cc",
+ "../ash/policy/external_data/device_local_account_external_data_manager.h",
+ "../ash/policy/external_data/device_local_account_external_data_service.cc",
+ "../ash/policy/external_data/device_local_account_external_data_service.h",
+ "../ash/policy/external_data/device_policy_cloud_external_data_manager.cc",
+ "../ash/policy/external_data/device_policy_cloud_external_data_manager.h",
+ "../ash/policy/external_data/handlers/cloud_external_data_policy_handler.cc",
+ "../ash/policy/external_data/handlers/cloud_external_data_policy_handler.h",
+ "../ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc",
+ "../ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h",
+ "../ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.cc",
+ "../ash/policy/external_data/handlers/device_cloud_external_data_policy_handler.h",
+ "../ash/policy/external_data/handlers/device_print_servers_external_data_handler.cc",
+ "../ash/policy/external_data/handlers/device_print_servers_external_data_handler.h",
+ "../ash/policy/external_data/handlers/device_printers_external_data_handler.cc",
+ "../ash/policy/external_data/handlers/device_printers_external_data_handler.h",
+ "../ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.cc",
+ "../ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h",
+ "../ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.cc",
+ "../ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h",
+ "../ash/policy/external_data/handlers/print_servers_external_data_handler.cc",
+ "../ash/policy/external_data/handlers/print_servers_external_data_handler.h",
+ "../ash/policy/external_data/handlers/printers_external_data_handler.cc",
+ "../ash/policy/external_data/handlers/printers_external_data_handler.h",
+ "../ash/policy/external_data/handlers/user_avatar_image_external_data_handler.cc",
+ "../ash/policy/external_data/handlers/user_avatar_image_external_data_handler.h",
+ "../ash/policy/external_data/handlers/wallpaper_image_external_data_handler.cc",
+ "../ash/policy/external_data/handlers/wallpaper_image_external_data_handler.h",
+ "../ash/policy/external_data/user_cloud_external_data_manager.cc",
+ "../ash/policy/external_data/user_cloud_external_data_manager.h",
"../ash/power/auto_screen_brightness/adapter.cc",
"../ash/power/auto_screen_brightness/adapter.h",
"../ash/power/auto_screen_brightness/als_file_reader.cc",
@@ -2726,57 +2777,6 @@
"platform_keys/platform_keys_service_factory.cc",
"platform_keys/platform_keys_service_factory.h",
"platform_keys/platform_keys_service_nss.cc",
- "policy/enrollment/account_status_check_fetcher.cc",
- "policy/enrollment/account_status_check_fetcher.h",
- "policy/enrollment/auto_enrollment_client.h",
- "policy/enrollment/auto_enrollment_client_impl.cc",
- "policy/enrollment/auto_enrollment_client_impl.h",
- "policy/enrollment/device_cloud_policy_initializer.cc",
- "policy/enrollment/device_cloud_policy_initializer.h",
- "policy/enrollment/enrollment_config.cc",
- "policy/enrollment/enrollment_config.h",
- "policy/enrollment/enrollment_handler_chromeos.cc",
- "policy/enrollment/enrollment_handler_chromeos.h",
- "policy/enrollment/enrollment_requisition_manager.cc",
- "policy/enrollment/enrollment_requisition_manager.h",
- "policy/enrollment/fake_auto_enrollment_client.cc",
- "policy/enrollment/fake_auto_enrollment_client.h",
- "policy/external_data/cloud_external_data_manager_base.cc",
- "policy/external_data/cloud_external_data_manager_base.h",
- "policy/external_data/cloud_external_data_policy_observer.cc",
- "policy/external_data/cloud_external_data_policy_observer.h",
- "policy/external_data/device_cloud_external_data_policy_observer.cc",
- "policy/external_data/device_cloud_external_data_policy_observer.h",
- "policy/external_data/device_local_account_external_data_manager.cc",
- "policy/external_data/device_local_account_external_data_manager.h",
- "policy/external_data/device_local_account_external_data_service.cc",
- "policy/external_data/device_local_account_external_data_service.h",
- "policy/external_data/device_policy_cloud_external_data_manager.cc",
- "policy/external_data/device_policy_cloud_external_data_manager.h",
- "policy/external_data/handlers/cloud_external_data_policy_handler.cc",
- "policy/external_data/handlers/cloud_external_data_policy_handler.h",
- "policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc",
- "policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.h",
- "policy/external_data/handlers/device_cloud_external_data_policy_handler.cc",
- "policy/external_data/handlers/device_cloud_external_data_policy_handler.h",
- "policy/external_data/handlers/device_print_servers_external_data_handler.cc",
- "policy/external_data/handlers/device_print_servers_external_data_handler.h",
- "policy/external_data/handlers/device_printers_external_data_handler.cc",
- "policy/external_data/handlers/device_printers_external_data_handler.h",
- "policy/external_data/handlers/device_wallpaper_image_external_data_handler.cc",
- "policy/external_data/handlers/device_wallpaper_image_external_data_handler.h",
- "policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.cc",
- "policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler.h",
- "policy/external_data/handlers/print_servers_external_data_handler.cc",
- "policy/external_data/handlers/print_servers_external_data_handler.h",
- "policy/external_data/handlers/printers_external_data_handler.cc",
- "policy/external_data/handlers/printers_external_data_handler.h",
- "policy/external_data/handlers/user_avatar_image_external_data_handler.cc",
- "policy/external_data/handlers/user_avatar_image_external_data_handler.h",
- "policy/external_data/handlers/wallpaper_image_external_data_handler.cc",
- "policy/external_data/handlers/wallpaper_image_external_data_handler.h",
- "policy/external_data/user_cloud_external_data_manager.cc",
- "policy/external_data/user_cloud_external_data_manager.h",
"policy/handlers/adb_sideloading_allowance_mode_policy_handler.cc",
"policy/handlers/adb_sideloading_allowance_mode_policy_handler.h",
"policy/handlers/bluetooth_policy_handler.cc",
@@ -3941,6 +3941,13 @@
"../ash/policy/dlp/mock_dlp_content_manager.h",
"../ash/policy/dlp/mock_dlp_rules_manager.cc",
"../ash/policy/dlp/mock_dlp_rules_manager.h",
+ "../ash/policy/enrollment/auto_enrollment_client_impl_unittest.cc",
+ "../ash/policy/enrollment/account_status_check_fetcher_unittest.cc",
+ "../ash/policy/enrollment/device_cloud_policy_initializer_unittest.cc",
+ "../ash/policy/external_data/cloud_external_data_manager_base_unittest.cc",
+ "../ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc",
+ "../ash/policy/external_data/handlers/device_print_servers_external_data_handler_unittest.cc",
+ "../ash/policy/external_data/handlers/device_printers_external_data_handler_unittest.cc",
"../ash/power/auto_screen_brightness/adapter_unittest.cc",
"../ash/power/auto_screen_brightness/als_file_reader_unittest.cc",
"../ash/power/auto_screen_brightness/als_reader_unittest.cc",
@@ -4159,13 +4166,6 @@
"phonehub/browser_tabs_model_provider_impl_unittest.cc",
"platform_keys/key_permissions/arc_key_permissions_manager_delegate_unittest.cc",
"platform_keys/key_permissions/key_permissions_service_impl_unittest.cc",
- "policy/enrollment/account_status_check_fetcher_unittest.cc",
- "policy/enrollment/auto_enrollment_client_impl_unittest.cc",
- "policy/enrollment/device_cloud_policy_initializer_unittest.cc",
- "policy/external_data/cloud_external_data_manager_base_unittest.cc",
- "policy/external_data/cloud_external_data_policy_observer_unittest.cc",
- "policy/external_data/handlers/device_print_servers_external_data_handler_unittest.cc",
- "policy/external_data/handlers/device_printers_external_data_handler_unittest.cc",
"policy/handlers/adb_sideloading_allowance_mode_policy_handler_unittest.cc",
"policy/handlers/bluetooth_policy_handler_unittest.cc",
"policy/handlers/configuration_policy_handler_chromeos_unittest.cc",
diff --git a/chrome/browser/chromeos/policy/external_data/handlers/device_cloud_external_data_policy_handler.h b/chrome/browser/chromeos/policy/external_data/handlers/device_cloud_external_data_policy_handler.h
deleted file mode 100644
index 6d8426c..0000000
--- a/chrome/browser/chromeos/policy/external_data/handlers/device_cloud_external_data_policy_handler.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
-
-#include "chrome/browser/chromeos/policy/external_data/device_cloud_external_data_policy_observer.h"
-
-namespace policy {
-
-// Base class for handling per-device external resources like wallpaper or
-// printers configuration.
-class DeviceCloudExternalDataPolicyHandler
- : public DeviceCloudExternalDataPolicyObserver::Delegate {
- public:
- DeviceCloudExternalDataPolicyHandler();
-
- virtual void Shutdown() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DeviceCloudExternalDataPolicyHandler);
-};
-
-} // namespace policy
-
-#endif // CHROME_BROWSER_CHROMEOS_POLICY_EXTERNAL_DATA_HANDLERS_DEVICE_CLOUD_EXTERNAL_DATA_POLICY_HANDLER_H_
diff --git a/chrome/browser/feedback/feedback_uploader_chrome.cc b/chrome/browser/feedback/feedback_uploader_chrome.cc
index bdb36a0..d1c5aca0 100644
--- a/chrome/browser/feedback/feedback_uploader_chrome.cc
+++ b/chrome/browser/feedback/feedback_uploader_chrome.cc
@@ -22,7 +22,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chromeos/components/chromebox_for_meetings/buildflags/buildflags.h"
#if BUILDFLAG(PLATFORM_CFM)
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/device_identity/device_identity_provider.h"
#include "chrome/browser/device_identity/device_oauth2_token_service_factory.h"
#endif // BUILDFLAG(PLATFORM_CFM)
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 6d8a85c..98e70552 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -313,6 +313,9 @@
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/core/dm_token_storage.h"
#include "chrome/browser/ash/policy/dlp/dlp_rules_manager_impl.h"
+#include "chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
+#include "chrome/browser/ash/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h"
#include "chrome/browser/ash/power/auto_screen_brightness/metrics_reporter.h"
#include "chrome/browser/ash/power/power_metrics_reporter.h"
#include "chrome/browser/ash/release_notes/release_notes_storage.h"
@@ -327,9 +330,6 @@
#include "chrome/browser/chromeos/first_run/first_run.h"
#include "chrome/browser/chromeos/full_restore/full_restore_prefs.h"
#include "chrome/browser/chromeos/net/network_throttling_observer.h"
-#include "chrome/browser/chromeos/policy/enrollment/auto_enrollment_client_impl.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
-#include "chrome/browser/chromeos/policy/external_data/handlers/device_wallpaper_image_external_data_handler.h"
#include "chrome/browser/chromeos/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h"
#include "chrome/browser/chromeos/policy/handlers/minimum_version_policy_handler.h"
#include "chrome/browser/chromeos/policy/networking/policy_cert_service_factory.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index bd513c2..62512c4 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -26,10 +26,10 @@
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/ui/oobe_dialog_size_utils.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/system/input_device_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h"
#include "chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
index 85b9b66..42f7beb 100644
--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
@@ -26,9 +26,9 @@
#include "chrome/browser/ash/login/wizard_controller.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
#include "chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/policy/enrollment_status.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/chromeos/login/cookie_waiter.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
index b46364a..e828a95 100644
--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
@@ -13,7 +13,7 @@
#include "chrome/browser/ash/login/enrollment/enrollment_screen_view.h"
#include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h"
#include "chrome/browser/ash/login/screens/error_screen.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_config.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
#include "net/base/net_errors.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index 11657ec9..3f97734 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -29,11 +29,11 @@
#include "chrome/browser/ash/login/screens/error_screen.h"
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/system/input_device_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/multidevice_setup/multidevice_setup_service_factory.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.cc
index ef78f46..4e12fbd84 100644
--- a/chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.cc
@@ -22,10 +22,10 @@
#include "chrome/browser/ash/login/screens/welcome_screen.h"
#include "chrome/browser/ash/login/ui/input_events_blocker.h"
#include "chrome/browser/ash/login/ui/login_display_host.h"
+#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/system/input_device_settings.h"
#include "chrome/browser/ash/system/timezone_util.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.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 ccb652b..c7d3d16 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
@@ -50,9 +50,9 @@
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/dlp/dlp_rules_manager.h"
#include "chrome/browser/ash/policy/dlp/mock_dlp_rules_manager.h"
+#include "chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h"
#include "chrome/browser/ash/settings/device_settings_test_helper.h"
#include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
-#include "chrome/browser/chromeos/policy/enrollment/device_cloud_policy_initializer.h"
#include "chrome/browser/chromeos/policy/status_collector/device_status_collector.h"
#include "chrome/browser/chromeos/policy/status_collector/status_collector.h"
#include "chrome/browser/chromeos/policy/uploading/status_uploader.h"
