Move dirs from chrome/browser/chromeos/login/
app_mode/, auth/ and demo_mode/ are moved to chrome/browser/ash/login/.
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
No-Presubmit: true
Bug: 1164001
Change-Id: I9b98777d8d45d8609d2d554c70b4493b8e3d7fac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2712872
Commit-Queue: Henrique Ferreiro <[email protected]>
Owners-Override: Henrique Ferreiro <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
Cr-Commit-Position: refs/heads/master@{#857141}
diff --git a/WATCHLISTS b/WATCHLISTS
index e9e17a4..82853648 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -919,7 +919,7 @@
},
'demo_mode': {
'filepath': 'docs/login/demo_mode.md|'\
- 'chrome/browser/chromeos/login/demo_mode/|'\
+ 'chrome/browser/ash/login/demo_mode/|'\
'ash/metrics/demo_session_metrics_recorder.*',
},
'desktop_in_product_help': {
diff --git a/chrome/browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_api.cc b/chrome/browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_api.cc
index 791bade..a2e6dba9 100644
--- a/chrome/browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_api.cc
+++ b/chrome/browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_api.cc
@@ -9,7 +9,7 @@
#include "base/check_op.h"
#include "base/no_destructor.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
#include "chrome/common/apps/platform_apps/api/arc_apps_private.h"
diff --git a/chrome/browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_apitest.cc b/chrome/browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_apitest.cc
index 79fb4ad..9127673 100644
--- a/chrome/browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_apitest.cc
+++ b/chrome/browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_apitest.cc
@@ -6,9 +6,9 @@
#include "base/path_service.h"
#include "base/test/metrics/histogram_tester.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/ash/app_mode/app_session.cc b/chrome/browser/ash/app_mode/app_session.cc
index e392596..6a606d0f 100644
--- a/chrome/browser/ash/app_mode/app_session.cc
+++ b/chrome/browser/ash/app_mode/app_session.cc
@@ -19,9 +19,9 @@
#include "chrome/browser/ash/app_mode/kiosk_mode_idle_app_name_notification.h"
#include "chrome/browser/ash/app_mode/kiosk_session_plugin_handler.h"
#include "chrome/browser/ash/app_mode/kiosk_settings_navigation_throttle.h"
+#include "chrome/browser/ash/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_profile_loader.cc b/chrome/browser/ash/app_mode/kiosk_profile_loader.cc
index 385c9f1..32cb9c2 100644
--- a/chrome/browser/ash/app_mode/kiosk_profile_loader.cc
+++ b/chrome/browser/ash/app_mode/kiosk_profile_loader.cc
@@ -17,8 +17,8 @@
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_app_types.h"
-#include "chrome/browser/chromeos/login/auth/chrome_login_performer.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
+#include "chrome/browser/ash/login/auth/chrome_login_performer.h"
+#include "chrome/browser/ash/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chromeos/dbus/cryptohome/cryptohome_client.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/ash/assistant/assistant_util.cc b/chrome/browser/ash/assistant/assistant_util.cc
index 5232afe..b56f742 100644
--- a/chrome/browser/ash/assistant/assistant_util.cc
+++ b/chrome/browser/ash/assistant/assistant_util.cc
@@ -8,8 +8,8 @@
#include "ash/constants/devicetype.h"
#include "base/strings/string_util.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
diff --git a/chrome/browser/ash/assistant/assistant_util_unittest.cc b/chrome/browser/ash/assistant/assistant_util_unittest.cc
index 8bea0dc7..75ff58a 100644
--- a/chrome/browser/ash/assistant/assistant_util_unittest.cc
+++ b/chrome/browser/ash/assistant/assistant_util_unittest.cc
@@ -8,7 +8,7 @@
#include <string>
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/signin/identity_test_environment_profile_adaptor.h"
#include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/ash/login/DEPS b/chrome/browser/ash/login/DEPS
new file mode 100644
index 0000000..f3979f1a
--- /dev/null
+++ b/chrome/browser/ash/login/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+ "+extensions/components/native_app_window",
+]
diff --git a/chrome/browser/ash/login/DIR_METADATA b/chrome/browser/ash/login/DIR_METADATA
new file mode 100644
index 0000000..d7952fd
--- /dev/null
+++ b/chrome/browser/ash/login/DIR_METADATA
@@ -0,0 +1,14 @@
+# Metadata information for this directory.
+#
+# For more information on DIR_METADATA files, see:
+# https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/README.md
+#
+# For the schema of this file, see Metadata message:
+# https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/proto/dir_metadata.proto
+
+monorail {
+ component: "UI>Shell>OOBE"
+}
+
+team_email: "[email protected]"
+os: CHROME_OS
diff --git a/chrome/browser/ash/login/OWNERS b/chrome/browser/ash/login/OWNERS
new file mode 100644
index 0000000..0cb8af2
--- /dev/null
+++ b/chrome/browser/ash/login/OWNERS
@@ -0,0 +1,11 @@
+file://ash/login/LOGIN_LOCK_OWNERS
+
+# (in PST)
[email protected]
[email protected]
+
+per-file *wizard_controller.*=set noparent
+per-file *wizard_controller.*=file://ash/login/LOGIN_LOCK_OWNERS
+
+per-file *challenge_response*[email protected]
+per-file *security_token*[email protected]
diff --git a/chrome/browser/chromeos/login/app_mode/DIR_METADATA b/chrome/browser/ash/login/app_mode/DIR_METADATA
similarity index 100%
rename from chrome/browser/chromeos/login/app_mode/DIR_METADATA
rename to chrome/browser/ash/login/app_mode/DIR_METADATA
diff --git a/chrome/browser/chromeos/login/app_mode/OWNERS b/chrome/browser/ash/login/app_mode/OWNERS
similarity index 100%
rename from chrome/browser/chromeos/login/app_mode/OWNERS
rename to chrome/browser/ash/login/app_mode/OWNERS
diff --git a/chrome/browser/chromeos/login/app_mode/auto_launched_kiosk_browsertest.cc b/chrome/browser/ash/login/app_mode/auto_launched_kiosk_browsertest.cc
similarity index 99%
rename from chrome/browser/chromeos/login/app_mode/auto_launched_kiosk_browsertest.cc
rename to chrome/browser/ash/login/app_mode/auto_launched_kiosk_browsertest.cc
index 25efabf..d996019 100644
--- a/chrome/browser/chromeos/login/app_mode/auto_launched_kiosk_browsertest.cc
+++ b/chrome/browser/ash/login/app_mode/auto_launched_kiosk_browsertest.cc
@@ -14,8 +14,8 @@
#include "chrome/browser/ash/app_mode/fake_cws.h"
#include "chrome/browser/ash/app_mode/kiosk_app_launch_error.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
+#include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h"
#include "chrome/browser/chromeos/login/test/device_state_mixin.h"
#include "chrome/browser/chromeos/login/test/embedded_test_server_mixin.h"
#include "chrome/browser/chromeos/login/test/login_manager_mixin.h"
diff --git a/chrome/browser/chromeos/login/app_mode/kiosk_browsertest.cc b/chrome/browser/ash/login/app_mode/kiosk_browsertest.cc
similarity index 99%
rename from chrome/browser/chromeos/login/app_mode/kiosk_browsertest.cc
rename to chrome/browser/ash/login/app_mode/kiosk_browsertest.cc
index a93741c..9b4ce3d 100644
--- a/chrome/browser/chromeos/login/app_mode/kiosk_browsertest.cc
+++ b/chrome/browser/ash/login/app_mode/kiosk_browsertest.cc
@@ -36,11 +36,11 @@
#include "chrome/browser/ash/app_mode/kiosk_app_launch_error.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_settings_navigation_throttle.h"
+#include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.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/file_manager/fake_disk_mount_manager.h"
-#include "chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/test/device_state_mixin.h"
#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
diff --git a/chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.cc b/chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc
similarity index 99%
rename from chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.cc
rename to chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc
index d8bfd08..285e493 100644
--- a/chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.cc
+++ b/chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h"
+#include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.h"
#include "base/metrics/histogram_macros.h"
#include "base/syslog_logging.h"
diff --git a/chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h b/chrome/browser/ash/login/app_mode/kiosk_launch_controller.h
similarity index 97%
rename from chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h
rename to chrome/browser/ash/login/app_mode/kiosk_launch_controller.h
index 3ec8cb7..1cd9e13 100644
--- a/chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h
+++ b/chrome/browser/ash/login/app_mode/kiosk_launch_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_APP_MODE_KIOSK_LAUNCH_CONTROLLER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_APP_MODE_KIOSK_LAUNCH_CONTROLLER_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_APP_MODE_KIOSK_LAUNCH_CONTROLLER_H_
+#define CHROME_BROWSER_ASH_LOGIN_APP_MODE_KIOSK_LAUNCH_CONTROLLER_H_
#include "chrome/browser/ash/app_mode/kiosk_app_launcher.h"
#include "chrome/browser/ash/app_mode/kiosk_app_types.h"
@@ -206,4 +206,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_MODE_KIOSK_LAUNCH_CONTROLLER_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_APP_MODE_KIOSK_LAUNCH_CONTROLLER_H_
diff --git a/chrome/browser/chromeos/login/app_mode/kiosk_launch_controller_browsertest.cc b/chrome/browser/ash/login/app_mode/kiosk_launch_controller_browsertest.cc
similarity index 99%
rename from chrome/browser/chromeos/login/app_mode/kiosk_launch_controller_browsertest.cc
rename to chrome/browser/ash/login/app_mode/kiosk_launch_controller_browsertest.cc
index 143d2903..e07e79a 100644
--- a/chrome/browser/chromeos/login/app_mode/kiosk_launch_controller_browsertest.cc
+++ b/chrome/browser/ash/login/app_mode/kiosk_launch_controller_browsertest.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_app_types.h"
#include "chrome/browser/ash/app_mode/web_app/mock_web_kiosk_app_launcher.h"
-#include "chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h"
+#include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.h"
#include "chrome/browser/chromeos/login/test/kiosk_test_helpers.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/external_provider_impl.h"
diff --git a/chrome/browser/chromeos/login/app_mode/web_kiosk_browsertest.cc b/chrome/browser/ash/login/app_mode/web_kiosk_browsertest.cc
similarity index 99%
rename from chrome/browser/chromeos/login/app_mode/web_kiosk_browsertest.cc
rename to chrome/browser/ash/login/app_mode/web_kiosk_browsertest.cc
index 1a237b19..fdde6f32 100644
--- a/chrome/browser/chromeos/login/app_mode/web_kiosk_browsertest.cc
+++ b/chrome/browser/ash/login/app_mode/web_kiosk_browsertest.cc
@@ -8,7 +8,7 @@
#include "ash/public/cpp/shelf_test_api.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
-#include "chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h"
+#include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.h"
#include "chrome/browser/chromeos/login/test/device_state_mixin.h"
#include "chrome/browser/chromeos/login/test/js_checker.h"
#include "chrome/browser/chromeos/login/test/kiosk_test_helpers.h"
diff --git a/chrome/browser/chromeos/login/auth/auth_prewarmer.cc b/chrome/browser/ash/login/auth/auth_prewarmer.cc
similarity index 97%
rename from chrome/browser/chromeos/login/auth/auth_prewarmer.cc
rename to chrome/browser/ash/login/auth/auth_prewarmer.cc
index e09d78f..1bd0fced 100644
--- a/chrome/browser/chromeos/login/auth/auth_prewarmer.cc
+++ b/chrome/browser/ash/login/auth/auth_prewarmer.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/login/auth/auth_prewarmer.h"
+#include "chrome/browser/ash/login/auth/auth_prewarmer.h"
#include <stddef.h>
diff --git a/chrome/browser/chromeos/login/auth/auth_prewarmer.h b/chrome/browser/ash/login/auth/auth_prewarmer.h
similarity index 82%
rename from chrome/browser/chromeos/login/auth/auth_prewarmer.h
rename to chrome/browser/ash/login/auth/auth_prewarmer.h
index 208cd0d..056575a 100644
--- a/chrome/browser/chromeos/login/auth/auth_prewarmer.h
+++ b/chrome/browser/ash/login/auth/auth_prewarmer.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_LOGIN_AUTH_AUTH_PREWARMER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_AUTH_AUTH_PREWARMER_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_AUTH_AUTH_PREWARMER_H_
+#define CHROME_BROWSER_ASH_LOGIN_AUTH_AUTH_PREWARMER_H_
#include "base/callback.h"
#include "base/macros.h"
@@ -36,4 +36,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_AUTH_AUTH_PREWARMER_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_AUTH_AUTH_PREWARMER_H_
diff --git a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc b/chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.cc
similarity index 95%
rename from chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc
rename to chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.cc
index 9d9b103..1f97003 100644
--- a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc
+++ b/chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.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/login/auth/chrome_cryptohome_authenticator.h"
+#include "chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
diff --git a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h b/chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.h
similarity index 77%
rename from chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h
rename to chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.h
index a0d79f6..70366fa 100644
--- a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h
+++ b/chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.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_LOGIN_AUTH_CHROME_CRYPTOHOME_AUTHENTICATOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_AUTH_CHROME_CRYPTOHOME_AUTHENTICATOR_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_AUTH_CHROME_CRYPTOHOME_AUTHENTICATOR_H_
+#define CHROME_BROWSER_ASH_LOGIN_AUTH_CHROME_CRYPTOHOME_AUTHENTICATOR_H_
#include <string>
@@ -30,4 +30,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_AUTH_CHROME_CRYPTOHOME_AUTHENTICATOR_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_AUTH_CHROME_CRYPTOHOME_AUTHENTICATOR_H_
diff --git a/chrome/browser/chromeos/login/auth/chrome_login_performer.cc b/chrome/browser/ash/login/auth/chrome_login_performer.cc
similarity index 98%
rename from chrome/browser/chromeos/login/auth/chrome_login_performer.cc
rename to chrome/browser/ash/login/auth/chrome_login_performer.cc
index 39f21fc..540e142 100644
--- a/chrome/browser/chromeos/login/auth/chrome_login_performer.cc
+++ b/chrome/browser/ash/login/auth/chrome_login_performer.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/login/auth/chrome_login_performer.h"
+#include "chrome/browser/ash/login/auth/chrome_login_performer.h"
#include "base/bind.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/chromeos/login/auth/chrome_login_performer.h b/chrome/browser/ash/login/auth/chrome_login_performer.h
similarity index 93%
rename from chrome/browser/chromeos/login/auth/chrome_login_performer.h
rename to chrome/browser/ash/login/auth/chrome_login_performer.h
index 53d1903..92a3ce9 100644
--- a/chrome/browser/chromeos/login/auth/chrome_login_performer.h
+++ b/chrome/browser/ash/login/auth/chrome_login_performer.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_LOGIN_AUTH_CHROME_LOGIN_PERFORMER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_AUTH_CHROME_LOGIN_PERFORMER_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_AUTH_CHROME_LOGIN_PERFORMER_H_
+#define CHROME_BROWSER_ASH_LOGIN_AUTH_CHROME_LOGIN_PERFORMER_H_
#include <memory>
#include <string>
@@ -84,4 +84,4 @@
using ::chromeos::ChromeLoginPerformer;
}
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_AUTH_CHROME_LOGIN_PERFORMER_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_AUTH_CHROME_LOGIN_PERFORMER_H_
diff --git a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
rename to chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc
index fc264ff1..6f94689 100644
--- a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
+++ b/chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc
@@ -18,8 +18,8 @@
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
+#include "chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/OWNERS b/chrome/browser/ash/login/demo_mode/OWNERS
similarity index 100%
rename from chrome/browser/chromeos/login/demo_mode/OWNERS
rename to chrome/browser/ash/login/demo_mode/OWNERS
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc b/chrome/browser/ash/login/demo_mode/demo_app_launcher.cc
similarity index 98%
rename from chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
rename to chrome/browser/ash/login/demo_mode/demo_app_launcher.cc
index a5c0040..0a8b7a8 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_app_launcher.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/login/demo_mode/demo_app_launcher.h"
+#include "chrome/browser/ash/login/demo_mode/demo_app_launcher.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h b/chrome/browser/ash/login/demo_mode/demo_app_launcher.h
similarity index 86%
rename from chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h
rename to chrome/browser/ash/login/demo_mode/demo_app_launcher.h
index ec7f06a9..5e51d0f 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h
+++ b/chrome/browser/ash/login/demo_mode/demo_app_launcher.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_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_
+#define CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_
#include <memory>
#include <string>
@@ -55,4 +55,4 @@
using ::chromeos::DemoAppLauncher;
}
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc b/chrome/browser/ash/login/demo_mode/demo_app_launcher_browsertest.cc
similarity index 97%
rename from chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc
rename to chrome/browser/ash/login/demo_mode/demo_app_launcher_browsertest.cc
index 3553398..752f0b3 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_app_launcher_browsertest.cc
@@ -9,7 +9,7 @@
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/path_service.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
+#include "chrome/browser/ash/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/chromeos/login/test/session_manager_state_waiter.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader.cc b/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.cc
similarity index 96%
rename from chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader.cc
rename to chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.cc
index 41f75a5b..4773a47 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.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/login/demo_mode/demo_extensions_external_loader.h"
+#include "chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.h"
#include <utility>
@@ -16,11 +16,11 @@
#include "base/task/task_traits.h"
#include "base/task/thread_pool.h"
#include "base/values.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/extensions/external_cache_impl.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_resources.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/extensions/external_provider_impl.h"
#include "extensions/browser/extension_file_task_runner.h"
#include "extensions/common/extension_urls.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader.h b/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.h
similarity index 91%
rename from chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader.h
rename to chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.h
index 03cdd08..e7620e5 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader.h
+++ b/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.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_LOGIN_DEMO_MODE_DEMO_EXTENSIONS_EXTERNAL_LOADER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_EXTENSIONS_EXTERNAL_LOADER_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_EXTENSIONS_EXTERNAL_LOADER_H_
+#define CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_EXTENSIONS_EXTERNAL_LOADER_H_
#include <memory>
#include <string>
@@ -78,4 +78,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_EXTENSIONS_EXTERNAL_LOADER_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_EXTENSIONS_EXTERNAL_LOADER_H_
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader_unittest.cc
rename to chrome/browser/ash/login/demo_mode/demo_extensions_external_loader_unittest.cc
index ff22206..f746c57 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader_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/login/demo_mode/demo_extensions_external_loader.h"
+#include "chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.h"
#include <map>
#include <memory>
@@ -24,8 +24,8 @@
#include "base/values.h"
#include "base/version.h"
#include "build/build_config.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/extensions/external_provider_impl.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_mode_detector.cc b/chrome/browser/ash/login/demo_mode/demo_mode_detector.cc
similarity index 98%
rename from chrome/browser/chromeos/login/demo_mode/demo_mode_detector.cc
rename to chrome/browser/ash/login/demo_mode/demo_mode_detector.cc
index b2f79dbd..7e248b2 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_mode_detector.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_detector.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/login/demo_mode/demo_mode_detector.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_detector.h"
#include "ash/constants/ash_switches.h"
#include "base/bind.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_mode_detector.h b/chrome/browser/ash/login/demo_mode/demo_mode_detector.h
similarity index 90%
rename from chrome/browser/chromeos/login/demo_mode/demo_mode_detector.h
rename to chrome/browser/ash/login/demo_mode/demo_mode_detector.h
index 52b9c7a2..4272c6ba 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_mode_detector.h
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_detector.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_LOGIN_DEMO_MODE_DEMO_MODE_DETECTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_MODE_DETECTOR_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_MODE_DETECTOR_H_
+#define CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_MODE_DETECTOR_H_
#include <memory>
#include <string>
@@ -79,4 +79,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_MODE_DETECTOR_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_MODE_DETECTOR_H_
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_mode_detector_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_mode_detector_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/login/demo_mode/demo_mode_detector_unittest.cc
rename to chrome/browser/ash/login/demo_mode/demo_mode_detector_unittest.cc
index 45fec2d..c43854c1 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_mode_detector_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_detector_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/login/demo_mode/demo_mode_detector.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_detector.h"
#include <memory>
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover.cc b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.cc
similarity index 97%
rename from chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover.cc
rename to chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.cc
index 1dd550a..96906fb 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.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/login/demo_mode/demo_mode_resources_remover.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h"
#include <memory>
#include <utility>
@@ -20,12 +20,12 @@
#include "base/time/tick_clock.h"
#include "base/time/time.h"
#include "base/values.h"
+#include "chrome/browser/ash/login/demo_mode/demo_app_launcher.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/idle_detector.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_resources.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover.h b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h
similarity index 96%
rename from chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover.h
rename to chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h
index ce8b3669..a7d9eb2c 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover.h
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.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_LOGIN_DEMO_MODE_DEMO_MODE_RESOURCES_REMOVER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_MODE_RESOURCES_REMOVER_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_MODE_RESOURCES_REMOVER_H_
+#define CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_MODE_RESOURCES_REMOVER_H_
#include <memory>
#include <string>
@@ -201,4 +201,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_MODE_RESOURCES_REMOVER_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_MODE_RESOURCES_REMOVER_H_
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover_unittest.cc
rename to chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_unittest.cc
index f0af823..def86a6 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_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/login/demo_mode/demo_mode_resources_remover.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h"
#include <memory>
#include <string>
@@ -14,7 +14,7 @@
#include "base/optional.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chromeos/dbus/cryptohome/fake_cryptohome_client.h"
#include "chromeos/tpm/stub_install_attributes.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.cc b/chrome/browser/ash/login/demo_mode/demo_mode_test_helper.cc
similarity index 96%
rename from chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.cc
rename to chrome/browser/ash/login/demo_mode/demo_mode_test_helper.cc
index c51a516..03b1a3c 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_test_helper.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/login/demo_mode/demo_mode_test_helper.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h"
#include <memory>
#include <utility>
@@ -13,8 +13,8 @@
#include "base/files/file_util.h"
#include "base/run_loop.h"
#include "base/test/scoped_path_override.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_resources.h"
#include "chrome/browser/component_updater/fake_cros_component_manager.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.h b/chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h
similarity index 89%
rename from chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.h
rename to chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h
index ef52dc4d..27f83ba 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.h
+++ b/chrome/browser/ash/login/demo_mode/demo_mode_test_helper.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_LOGIN_DEMO_MODE_DEMO_MODE_TEST_HELPER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_MODE_TEST_HELPER_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_MODE_TEST_HELPER_H_
+#define CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_MODE_TEST_HELPER_H_
#include <memory>
#include "base/files/scoped_temp_dir.h"
#include "base/macros.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/test/base/browser_process_platform_part_test_api_chromeos.h"
namespace base {
@@ -75,4 +75,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_MODE_TEST_HELPER_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_MODE_TEST_HELPER_H_
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_resources.cc b/chrome/browser/ash/login/demo_mode/demo_resources.cc
similarity index 98%
rename from chrome/browser/chromeos/login/demo_mode/demo_resources.cc
rename to chrome/browser/ash/login/demo_mode/demo_resources.cc
index a93790c..74f0fc9 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_resources.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_resources.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/login/demo_mode/demo_resources.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.h"
#include "ash/constants/ash_paths.h"
#include "base/bind.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_resources.h b/chrome/browser/ash/login/demo_mode/demo_resources.h
similarity index 93%
rename from chrome/browser/chromeos/login/demo_mode/demo_resources.h
rename to chrome/browser/ash/login/demo_mode/demo_resources.h
index 9f950f9..2bf4e09 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_resources.h
+++ b/chrome/browser/ash/login/demo_mode/demo_resources.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_LOGIN_DEMO_MODE_DEMO_RESOURCES_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_RESOURCES_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_RESOURCES_H_
+#define CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_RESOURCES_H_
#include <list>
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/optional.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
namespace chromeos {
@@ -116,4 +116,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_RESOURCES_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_RESOURCES_H_
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_resources_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_resources_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/login/demo_mode/demo_resources_unittest.cc
rename to chrome/browser/ash/login/demo_mode/demo_resources_unittest.cc
index de7eb0e..a2e29c9 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_resources_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_resources_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/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include <memory>
#include <utility>
@@ -11,9 +11,9 @@
#include "base/callback_helpers.h"
#include "base/files/file_path.h"
#include "base/macros.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_resources.h"
#include "chrome/browser/component_updater/fake_cros_component_manager.h"
#include "chrome/test/base/browser_process_platform_part_test_api_chromeos.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_session.cc b/chrome/browser/ash/login/demo_mode/demo_session.cc
similarity index 98%
rename from chrome/browser/chromeos/login/demo_mode/demo_session.cc
rename to chrome/browser/ash/login/demo_mode/demo_session.cc
index 27fd4366..bf97118 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_session.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_session.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/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include <algorithm>
#include <utility>
@@ -28,11 +28,11 @@
#include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
#include "chrome/browser/apps/app_service/browser_app_launcher.h"
#include "chrome/browser/apps/platform_apps/app_load_service.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/file_manager/path_util.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_resources.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_session.h b/chrome/browser/ash/login/demo_mode/demo_session.h
similarity index 96%
rename from chrome/browser/chromeos/login/demo_mode/demo_session.h
rename to chrome/browser/ash/login/demo_mode/demo_session.h
index 30daace..3f5936c 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_session.h
+++ b/chrome/browser/ash/login/demo_mode/demo_session.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_LOGIN_DEMO_MODE_DEMO_SESSION_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_SESSION_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_SESSION_H_
+#define CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_SESSION_H_
#include <memory>
#include <string>
@@ -14,7 +14,7 @@
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observer.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader.h"
+#include "chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.h"
#include "components/session_manager/core/session_manager.h"
#include "components/session_manager/core/session_manager_observer.h"
#include "components/user_manager/user_manager.h"
@@ -248,4 +248,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_SESSION_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_SESSION_H_
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_session_browsertest.cc b/chrome/browser/ash/login/demo_mode/demo_session_browsertest.cc
similarity index 97%
rename from chrome/browser/chromeos/login/demo_mode/demo_session_browsertest.cc
rename to chrome/browser/ash/login/demo_mode/demo_session_browsertest.cc
index 33b8a1d..e75f04c 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_session_browsertest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_session_browsertest.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "base/macros.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/test/device_state_mixin.h"
#include "chrome/browser/chromeos/login/test/oobe_base_test.h"
#include "chrome/common/pref_names.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_session_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_session_unittest.cc
similarity index 99%
rename from chrome/browser/chromeos/login/demo_mode/demo_session_unittest.cc
rename to chrome/browser/ash/login/demo_mode/demo_session_unittest.cc
index 9944dcb6..56a0ae3 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_session_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_session_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/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include <list>
#include <map>
@@ -16,10 +16,10 @@
#include "base/optional.h"
#include "base/strings/utf_string_conversions.h"
#include "base/timer/mock_timer.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.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/login/demo_mode/demo_resources.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/component_updater/fake_cros_component_manager.h"
#include "chrome/browser/prefs/browser_prefs.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_setup_browsertest.cc b/chrome/browser/ash/login/demo_mode/demo_setup_browsertest.cc
similarity index 99%
rename from chrome/browser/chromeos/login/demo_mode/demo_setup_browsertest.cc
rename to chrome/browser/ash/login/demo_mode/demo_setup_browsertest.cc
index f4734349..de7d74ab 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_setup_browsertest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_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/login/demo_mode/demo_setup_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include <string>
@@ -20,8 +20,8 @@
#include "base/timer/timer.h"
#include "base/values.h"
#include "build/build_config.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.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/chromeos/login/mock_network_state_helper.h"
#include "chrome/browser/chromeos/login/oobe_screen.h"
#include "chrome/browser/chromeos/login/screens/demo_setup_screen.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_setup_controller.cc b/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc
similarity index 99%
rename from chrome/browser/chromeos/login/demo_mode/demo_setup_controller.cc
rename to chrome/browser/ash/login/demo_mode/demo_setup_controller.cc
index aab6b7c..c5e960c 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_setup_controller.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include <utility>
@@ -18,10 +18,10 @@
#include "base/task/thread_pool.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "base/time/time.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_resources.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h b/chrome/browser/ash/login/demo_mode/demo_setup_controller.h
similarity index 97%
rename from chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h
rename to chrome/browser/ash/login/demo_mode/demo_setup_controller.h
index c9ff19b..7128a87 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_SETUP_CONTROLLER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_SETUP_CONTROLLER_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_SETUP_CONTROLLER_H_
+#define CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_SETUP_CONTROLLER_H_
#include <string>
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
#include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
#include "chrome/browser/policy/enrollment_status.h"
@@ -332,4 +332,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_SETUP_CONTROLLER_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_SETUP_CONTROLLER_H_
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_setup_controller_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/login/demo_mode/demo_setup_controller_unittest.cc
rename to chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc
index 166f7ee..37a7d671 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_setup_controller_unittest.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include <memory>
@@ -14,9 +14,9 @@
#include "base/optional.h"
#include "base/run_loop.h"
#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/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.h"
#include "chrome/browser/chromeos/policy/enrollment_requisition_manager.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.cc b/chrome/browser/ash/login/demo_mode/demo_setup_test_utils.cc
similarity index 98%
rename from chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.cc
rename to chrome/browser/ash/login/demo_mode/demo_setup_test_utils.cc
index 94aa37a..8480e439 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.cc
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_test_utils.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_test_utils.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.h b/chrome/browser/ash/login/demo_mode/demo_setup_test_utils.h
similarity index 88%
rename from chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.h
rename to chrome/browser/ash/login/demo_mode/demo_setup_test_utils.h
index ad3d011..48d6b92 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.h
+++ b/chrome/browser/ash/login/demo_mode/demo_setup_test_utils.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_LOGIN_DEMO_MODE_DEMO_SETUP_TEST_UTILS_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_SETUP_TEST_UTILS_H_
+#ifndef CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_SETUP_TEST_UTILS_H_
+#define CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_SETUP_TEST_UTILS_H_
#include <string>
@@ -49,4 +49,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_SETUP_TEST_UTILS_H_
+#endif // CHROME_BROWSER_ASH_LOGIN_DEMO_MODE_DEMO_SETUP_TEST_UTILS_H_
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index e0ffdd4..4a5b48c 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -564,6 +564,28 @@
"../ash/certificate_provider/sign_requests.h",
"../ash/certificate_provider/thread_safe_certificate_map.cc",
"../ash/certificate_provider/thread_safe_certificate_map.h",
+ "../ash/login/app_mode/kiosk_launch_controller.cc",
+ "../ash/login/app_mode/kiosk_launch_controller.h",
+ "../ash/login/auth/auth_prewarmer.cc",
+ "../ash/login/auth/auth_prewarmer.h",
+ "../ash/login/auth/chrome_cryptohome_authenticator.cc",
+ "../ash/login/auth/chrome_cryptohome_authenticator.h",
+ "../ash/login/auth/chrome_login_performer.cc",
+ "../ash/login/auth/chrome_login_performer.h",
+ "../ash/login/demo_mode/demo_app_launcher.cc",
+ "../ash/login/demo_mode/demo_app_launcher.h",
+ "../ash/login/demo_mode/demo_extensions_external_loader.cc",
+ "../ash/login/demo_mode/demo_extensions_external_loader.h",
+ "../ash/login/demo_mode/demo_mode_detector.cc",
+ "../ash/login/demo_mode/demo_mode_detector.h",
+ "../ash/login/demo_mode/demo_mode_resources_remover.cc",
+ "../ash/login/demo_mode/demo_mode_resources_remover.h",
+ "../ash/login/demo_mode/demo_resources.cc",
+ "../ash/login/demo_mode/demo_resources.h",
+ "../ash/login/demo_mode/demo_session.cc",
+ "../ash/login/demo_mode/demo_session.h",
+ "../ash/login/demo_mode/demo_setup_controller.cc",
+ "../ash/login/demo_mode/demo_setup_controller.h",
"../ash/mobile/mobile_activator.cc",
"../ash/mobile/mobile_activator.h",
"../ash/notifications/deprecation_notification_controller.cc",
@@ -1690,34 +1712,12 @@
"lock_screen_apps/toast_dialog_view.h",
"logging.cc",
"logging.h",
- "login/app_mode/kiosk_launch_controller.cc",
- "login/app_mode/kiosk_launch_controller.h",
- "login/auth/auth_prewarmer.cc",
- "login/auth/auth_prewarmer.h",
- "login/auth/chrome_cryptohome_authenticator.cc",
- "login/auth/chrome_cryptohome_authenticator.h",
- "login/auth/chrome_login_performer.cc",
- "login/auth/chrome_login_performer.h",
"login/challenge_response_auth_keys_loader.cc",
"login/challenge_response_auth_keys_loader.h",
"login/chrome_restart_request.cc",
"login/chrome_restart_request.h",
"login/configuration_keys.cc",
"login/configuration_keys.h",
- "login/demo_mode/demo_app_launcher.cc",
- "login/demo_mode/demo_app_launcher.h",
- "login/demo_mode/demo_extensions_external_loader.cc",
- "login/demo_mode/demo_extensions_external_loader.h",
- "login/demo_mode/demo_mode_detector.cc",
- "login/demo_mode/demo_mode_detector.h",
- "login/demo_mode/demo_mode_resources_remover.cc",
- "login/demo_mode/demo_mode_resources_remover.h",
- "login/demo_mode/demo_resources.cc",
- "login/demo_mode/demo_resources.h",
- "login/demo_mode/demo_session.cc",
- "login/demo_mode/demo_session.h",
- "login/demo_mode/demo_setup_controller.cc",
- "login/demo_mode/demo_setup_controller.h",
"login/easy_unlock/chrome_proximity_auth_client.cc",
"login/easy_unlock/chrome_proximity_auth_client.h",
"login/easy_unlock/easy_unlock_auth_attempt.cc",
@@ -3273,6 +3273,8 @@
"../ash/app_mode/web_app/mock_web_kiosk_app_launcher.h",
"../ash/certificate_provider/test_certificate_provider_extension.cc",
"../ash/certificate_provider/test_certificate_provider_extension.h",
+ "../ash/login/demo_mode/demo_mode_test_helper.cc",
+ "../ash/login/demo_mode/demo_mode_test_helper.h",
"android_sms/fake_android_sms_app_manager.cc",
"android_sms/fake_android_sms_app_manager.h",
"android_sms/fake_android_sms_app_setup_controller.cc",
@@ -3312,8 +3314,6 @@
"input_method/stub_input_method_engine_observer.h",
"lock_screen_apps/fake_lock_screen_profile_creator.cc",
"lock_screen_apps/fake_lock_screen_profile_creator.h",
- "login/demo_mode/demo_mode_test_helper.cc",
- "login/demo_mode/demo_mode_test_helper.h",
"login/enrollment/enterprise_enrollment_helper_mock.cc",
"login/enrollment/enterprise_enrollment_helper_mock.h",
"login/enrollment/mock_enrollment_screen.cc",
@@ -3456,6 +3456,15 @@
"../ash/app_mode/web_app/web_kiosk_app_launcher_unittest.cc",
"../ash/assistant/assistant_util_unittest.cc",
"../ash/certificate_provider/certificate_provider_service_unittest.cc",
+ "../ash/login/auth/cryptohome_authenticator_unittest.cc",
+ "../ash/login/demo_mode/demo_extensions_external_loader_unittest.cc",
+ "../ash/login/demo_mode/demo_mode_detector_unittest.cc",
+ "../ash/login/demo_mode/demo_mode_resources_remover_unittest.cc",
+ "../ash/login/demo_mode/demo_resources_unittest.cc",
+ "../ash/login/demo_mode/demo_session_unittest.cc",
+ "../ash/login/demo_mode/demo_setup_controller_unittest.cc",
+ "../ash/login/demo_mode/demo_setup_test_utils.cc",
+ "../ash/login/demo_mode/demo_setup_test_utils.h",
"../ash/mobile/mobile_activator_unittest.cc",
"../ash/system/automatic_reboot_manager_unittest.cc",
"../ash/system/device_disabling_manager_unittest.cc",
@@ -3783,15 +3792,6 @@
"lock_screen_apps/app_manager_impl_unittest.cc",
"lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc",
"lock_screen_apps/state_controller_unittest.cc",
- "login/auth/cryptohome_authenticator_unittest.cc",
- "login/demo_mode/demo_extensions_external_loader_unittest.cc",
- "login/demo_mode/demo_mode_detector_unittest.cc",
- "login/demo_mode/demo_mode_resources_remover_unittest.cc",
- "login/demo_mode/demo_resources_unittest.cc",
- "login/demo_mode/demo_session_unittest.cc",
- "login/demo_mode/demo_setup_controller_unittest.cc",
- "login/demo_mode/demo_setup_test_utils.cc",
- "login/demo_mode/demo_setup_test_utils.h",
"login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc",
"login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc",
"login/enrollment/enrollment_screen_unittest.cc",
diff --git a/chrome/browser/chromeos/arc/arc_demo_mode_delegate_impl.cc b/chrome/browser/chromeos/arc/arc_demo_mode_delegate_impl.cc
index d93352d..4bfee08c 100644
--- a/chrome/browser/chromeos/arc/arc_demo_mode_delegate_impl.cc
+++ b/chrome/browser/chromeos/arc/arc_demo_mode_delegate_impl.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "chrome/browser/chromeos/login/demo_mode/demo_resources.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
namespace arc {
diff --git a/chrome/browser/chromeos/arc/arc_demo_mode_delegate_impl_unittest.cc b/chrome/browser/chromeos/arc/arc_demo_mode_delegate_impl_unittest.cc
index f1253c9..65d3435 100644
--- a/chrome/browser/chromeos/arc/arc_demo_mode_delegate_impl_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_demo_mode_delegate_impl_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include "base/optional.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "components/user_manager/scoped_user_manager.h"
#include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/chromeos/arc/arc_optin_uma.cc b/chrome/browser/chromeos/arc/arc_optin_uma.cc
index 1a65806..33d9faf61 100644
--- a/chrome/browser/chromeos/arc/arc_optin_uma.cc
+++ b/chrome/browser/chromeos/arc/arc_optin_uma.cc
@@ -8,10 +8,10 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"
#include "chrome/browser/chromeos/arc/session/arc_provisioning_result.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "components/arc/arc_util.h"
diff --git a/chrome/browser/chromeos/arc/arc_util.cc b/chrome/browser/chromeos/arc/arc_util.cc
index e92ca77..547019e 100644
--- a/chrome/browser/chromeos/arc/arc_util.cc
+++ b/chrome/browser/chromeos/arc/arc_util.cc
@@ -25,6 +25,8 @@
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
#include "base/threading/scoped_blocking_call.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/chromeos/arc/arc_web_contents_data.h"
#include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"
@@ -32,8 +34,6 @@
#include "chrome/browser/chromeos/file_manager/path_util.h"
#include "chrome/browser/chromeos/guest_os/guest_os_share_path.h"
#include "chrome/browser/chromeos/login/configuration_keys.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/oobe_configuration.h"
#include "chrome/browser/chromeos/login/ui/login_display_host.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
diff --git a/chrome/browser/chromeos/arc/arc_util.h b/chrome/browser/chromeos/arc/arc_util.h
index 0263d1f..bf33b28 100644
--- a/chrome/browser/chromeos/arc/arc_util.h
+++ b/chrome/browser/chromeos/arc/arc_util.h
@@ -9,7 +9,7 @@
#include <memory>
#include "base/callback_forward.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "components/arc/session/arc_supervision_transition.h"
#include "storage/browser/file_system/file_system_url.h"
diff --git a/chrome/browser/chromeos/arc/arc_util_unittest.cc b/chrome/browser/chromeos/arc/arc_util_unittest.cc
index 13d8a9e4..5f72d59 100644
--- a/chrome/browser/chromeos/arc/arc_util_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_util_unittest.cc
@@ -14,10 +14,10 @@
#include "base/test/scoped_command_line.h"
#include "base/test/scoped_feature_list.h"
#include "base/values.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/oobe_configuration.h"
#include "chrome/browser/chromeos/login/ui/fake_login_display_host.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/chromeos/arc/auth/arc_auth_service.cc b/chrome/browser/chromeos/arc/auth/arc_auth_service.cc
index 300d0e7..7a2ca18 100644
--- a/chrome/browser/chromeos/arc/auth/arc_auth_service.cc
+++ b/chrome/browser/chromeos/arc/auth/arc_auth_service.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/account_manager_facade_factory.h"
#include "chrome/browser/ash/account_manager/account_manager_migrator.h"
#include "chrome/browser/ash/account_manager/account_manager_util.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/chromeos/arc/arc_optin_uma.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
@@ -24,7 +25,6 @@
#include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"
#include "chrome/browser/chromeos/arc/session/arc_provisioning_result.h"
#include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/identity_manager_factory.h"
diff --git a/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc b/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc
index 6a30643..64305c7 100644
--- a/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc
+++ b/chrome/browser/chromeos/arc/auth/arc_auth_service_browsertest.cc
@@ -19,6 +19,7 @@
#include "base/test/bind.h"
#include "chrome/browser/ash/certificate_provider/certificate_provider_service.h"
#include "chrome/browser/ash/certificate_provider/certificate_provider_service_factory.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
@@ -29,7 +30,6 @@
#include "chrome/browser/chromeos/arc/session/arc_service_launcher.h"
#include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
#include "chrome/browser/chromeos/arc/test/test_arc_session_manager.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/policy/profile_policy_connector.h"
diff --git a/chrome/browser/chromeos/arc/notification/arc_provision_notification_service.cc b/chrome/browser/chromeos/arc/notification/arc_provision_notification_service.cc
index 0d70836a..ad0385fa 100644
--- a/chrome/browser/chromeos/arc/notification/arc_provision_notification_service.cc
+++ b/chrome/browser/chromeos/arc/notification/arc_provision_notification_service.cc
@@ -8,9 +8,9 @@
#include "base/memory/singleton.h"
#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/notifications/notification_display_service.h"
#include "chrome/browser/notifications/notification_display_service_factory.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/arc/session/arc_demo_mode_preference_handler.cc b/chrome/browser/chromeos/arc/session/arc_demo_mode_preference_handler.cc
index dd796188..ddd61dc 100644
--- a/chrome/browser/chromeos/arc/session/arc_demo_mode_preference_handler.cc
+++ b/chrome/browser/chromeos/arc/session/arc_demo_mode_preference_handler.cc
@@ -10,9 +10,9 @@
#include "base/check.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/common/pref_names.h"
#include "components/arc/arc_util.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/arc/session/arc_demo_mode_preference_handler_unittest.cc b/chrome/browser/chromeos/arc/session/arc_demo_mode_preference_handler_unittest.cc
index 8286228..07c79d3 100644
--- a/chrome/browser/chromeos/arc/session/arc_demo_mode_preference_handler_unittest.cc
+++ b/chrome/browser/chromeos/arc/session/arc_demo_mode_preference_handler_unittest.cc
@@ -6,8 +6,8 @@
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/arc/session/arc_session_manager.cc b/chrome/browser/chromeos/arc/session/arc_session_manager.cc
index bb57664..8b433285 100644
--- a/chrome/browser/chromeos/arc/session/arc_session_manager.cc
+++ b/chrome/browser/chromeos/arc/session/arc_session_manager.cc
@@ -23,6 +23,8 @@
#include "base/task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/arc/arc_demo_mode_delegate_impl.h"
@@ -36,8 +38,6 @@
#include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h"
#include "chrome/browser/chromeos/arc/policy/arc_android_management_checker.h"
#include "chrome/browser/chromeos/arc/session/arc_provisioning_result.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_resources.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/policy/powerwash_requirements_checker.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/policy/profile_policy_connector.h"
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index e6e71bf..83dd288 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -43,6 +43,8 @@
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_mode_idle_app_name_notification.h"
#include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/system/breakpad_consent_watcher.h"
#include "chrome/browser/ash/system/input_device_settings.h"
@@ -86,8 +88,6 @@
#include "chrome/browser/chromeos/language_preferences.h"
#include "chrome/browser/chromeos/lock_screen_apps/state_controller.h"
#include "chrome/browser/chromeos/logging.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/login_screen_extensions_lifetime_manager.h"
diff --git a/chrome/browser/chromeos/extensions/install_limiter_unittest.cc b/chrome/browser/chromeos/extensions/install_limiter_unittest.cc
index 88fcc3ef..57d8b820 100644
--- a/chrome/browser/chromeos/extensions/install_limiter_unittest.cc
+++ b/chrome/browser/chromeos/extensions/install_limiter_unittest.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/chromeos/extensions/install_limiter.h"
#include "base/macros.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chromeos/tpm/stub_install_attributes.h"
#include "components/user_manager/scoped_user_manager.h"
diff --git a/chrome/browser/chromeos/file_manager/file_manager_string_util.cc b/chrome/browser/chromeos/file_manager/file_manager_string_util.cc
index 8169461a..5485da3 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_string_util.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_string_util.cc
@@ -10,9 +10,9 @@
#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/crostini/crostini_features.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/plugin_vm/plugin_vm_features.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_features.h"
diff --git a/chrome/browser/chromeos/login/configuration_based_oobe_browsertest.cc b/chrome/browser/chromeos/login/configuration_based_oobe_browsertest.cc
index 03563480..1cee452 100644
--- a/chrome/browser/chromeos/login/configuration_based_oobe_browsertest.cc
+++ b/chrome/browser/chromeos/login/configuration_based_oobe_browsertest.cc
@@ -5,11 +5,11 @@
#include "ash/constants/ash_switches.h"
#include "base/system/sys_info.h"
#include "build/build_config.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_test_utils.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/login/demo_mode/demo_setup_controller.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.h"
#include "chrome/browser/chromeos/login/test/enrollment_helper_mixin.h"
#include "chrome/browser/chromeos/login/test/enrollment_ui_mixin.h"
#include "chrome/browser/chromeos/login/test/fake_gaia_mixin.h"
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_local_policy_server_browsertest.cc b/chrome/browser/chromeos/login/enrollment/enrollment_local_policy_server_browsertest.cc
index 1f9410303..404b8ac 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_local_policy_server_browsertest.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_local_policy_server_browsertest.cc
@@ -10,10 +10,10 @@
#include "build/build_config.h"
#include "chrome/browser/ash/app_mode/fake_cws.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
+#include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.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/login/app_mode/kiosk_launch_controller.h"
#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h"
#include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h"
diff --git a/chrome/browser/chromeos/login/enterprise_user_session_metrics.cc b/chrome/browser/chromeos/login/enterprise_user_session_metrics.cc
index 4cf01a3..385eaa8 100644
--- a/chrome/browser/chromeos/login/enterprise_user_session_metrics.cc
+++ b/chrome/browser/chromeos/login/enterprise_user_session_metrics.cc
@@ -10,9 +10,9 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/common/pref_names.h"
#include "chromeos/login/auth/user_context.h"
diff --git a/chrome/browser/chromeos/login/enterprise_user_session_metrics_unittest.cc b/chrome/browser/chromeos/login/enterprise_user_session_metrics_unittest.cc
index c11a654..945c3bd 100644
--- a/chrome/browser/chromeos/login/enterprise_user_session_metrics_unittest.cc
+++ b/chrome/browser/chromeos/login/enterprise_user_session_metrics_unittest.cc
@@ -8,7 +8,7 @@
#include "base/test/metrics/histogram_tester.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chromeos/login/auth/user_context.h"
diff --git a/chrome/browser/chromeos/login/error_screen_browsertest.cc b/chrome/browser/chromeos/login/error_screen_browsertest.cc
index 6775ac8..f680485 100644
--- a/chrome/browser/chromeos/login/error_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/error_screen_browsertest.cc
@@ -7,7 +7,7 @@
#include "base/strings/strcat.h"
#include "base/test/bind.h"
#include "chrome/browser/ash/app_mode/fake_cws.h"
-#include "chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h"
+#include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.h"
#include "chrome/browser/chromeos/login/login_wizard.h"
#include "chrome/browser/chromeos/login/screens/error_screen.h"
#include "chrome/browser/chromeos/login/test/device_state_mixin.h"
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index a45ea9e..049fda1 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -32,6 +32,7 @@
#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/ash/app_mode/kiosk_app_launch_error.h"
#include "chrome/browser/ash/app_mode/kiosk_app_types.h"
+#include "chrome/browser/ash/login/auth/chrome_login_performer.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/system/device_disabling_manager.h"
#include "chrome/browser/browser_process.h"
@@ -41,7 +42,6 @@
#include "chrome/browser/chromeos/authpolicy/authpolicy_helper.h"
#include "chrome/browser/chromeos/boot_times_recorder.h"
#include "chrome/browser/chromeos/customization/customization_document.h"
-#include "chrome/browser/chromeos/login/auth/chrome_login_performer.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_service.h"
#include "chrome/browser/chromeos/login/enterprise_user_session_metrics.h"
#include "chrome/browser/chromeos/login/helper.h"
diff --git a/chrome/browser/chromeos/login/saml/in_session_password_change_manager.cc b/chrome/browser/chromeos/login/saml/in_session_password_change_manager.cc
index 4c066867..3e6058bf 100644
--- a/chrome/browser/chromeos/login/saml/in_session_password_change_manager.cc
+++ b/chrome/browser/chromeos/login/saml/in_session_password_change_manager.cc
@@ -10,10 +10,10 @@
#include "base/metrics/histogram_macros.h"
#include "base/task/post_task.h"
#include "base/task/task_traits.h"
+#include "chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
-#include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
#include "chrome/browser/chromeos/login/login_pref_names.h"
#include "chrome/browser/chromeos/login/saml/password_expiry_notification.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/login/saml/in_session_password_sync_manager.cc b/chrome/browser/chromeos/login/saml/in_session_password_sync_manager.cc
index 87a5c9370..497d6133 100644
--- a/chrome/browser/chromeos/login/saml/in_session_password_sync_manager.cc
+++ b/chrome/browser/chromeos/login/saml/in_session_password_sync_manager.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/chromeos/login/saml/in_session_password_sync_manager.h"
#include "base/time/default_clock.h"
+#include "chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/login_pref_names.h"
#include "chrome/browser/chromeos/login/saml/in_session_password_change_manager.h"
diff --git a/chrome/browser/chromeos/login/screens/demo_setup_screen.h b/chrome/browser/chromeos/login/screens/demo_setup_screen.h
index d924967..bdde50b 100644
--- a/chrome/browser/chromeos/login/screens/demo_setup_screen.h
+++ b/chrome/browser/chromeos/login/screens/demo_setup_screen.h
@@ -10,7 +10,7 @@
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/screens/base_screen.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/login/screens/error_screen.cc b/chrome/browser/chromeos/login/screens/error_screen.cc
index 07fd5a8e..094979aa 100644
--- a/chrome/browser/chromeos/login/screens/error_screen.cc
+++ b/chrome/browser/chromeos/login/screens/error_screen.cc
@@ -16,8 +16,8 @@
#include "chrome/browser/apps/app_service/browser_app_launcher.h"
#include "chrome/browser/ash/app_mode/certificate_manager_dialog.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
+#include "chrome/browser/ash/login/auth/chrome_login_performer.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/auth/chrome_login_performer.h"
#include "chrome/browser/chromeos/login/chrome_restart_request.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"
diff --git a/chrome/browser/chromeos/login/screens/hid_detection_screen.h b/chrome/browser/chromeos/login/screens/hid_detection_screen.h
index ec6f68a2..7e03c6e 100644
--- a/chrome/browser/chromeos/login/screens/hid_detection_screen.h
+++ b/chrome/browser/chromeos/login/screens/hid_detection_screen.h
@@ -17,7 +17,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/optional.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_mode_detector.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_detector.h"
#include "chrome/browser/chromeos/login/screens/base_screen.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_device.h"
diff --git a/chrome/browser/chromeos/login/screens/mock_demo_setup_screen.h b/chrome/browser/chromeos/login/screens/mock_demo_setup_screen.h
index e290d56..cf0f4ea 100644
--- a/chrome/browser/chromeos/login/screens/mock_demo_setup_screen.h
+++ b/chrome/browser/chromeos/login/screens/mock_demo_setup_screen.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_DEMO_SETUP_SCREEN_H_
#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_DEMO_SETUP_SCREEN_H_
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/screens/demo_setup_screen.h"
#include "chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/chromeos/login/screens/network_screen.cc b/chrome/browser/chromeos/login/screens/network_screen.cc
index 475352e..2462d13 100644
--- a/chrome/browser/chromeos/login/screens/network_screen.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/oobe_screen.h"
#include "chrome/browser/chromeos/login/wizard_context.h"
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index 37385a3..99dc57cc 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -22,11 +22,11 @@
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "base/values.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/system/system_clock.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_service.h"
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/lock_screen_utils.h"
diff --git a/chrome/browser/chromeos/login/screens/welcome_screen.cc b/chrome/browser/chromeos/login/screens/welcome_screen.cc
index 265f7e9..e0a4f37a 100644
--- a/chrome/browser/chromeos/login/screens/welcome_screen.cc
+++ b/chrome/browser/chromeos/login/screens/welcome_screen.cc
@@ -17,13 +17,13 @@
#include "base/time/default_tick_clock.h"
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
#include "chrome/browser/ash/accessibility/magnification_manager.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.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/base/locale_util.h"
#include "chrome/browser/chromeos/customization/customization_document.h"
#include "chrome/browser/chromeos/login/configuration_keys.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/oobe_screen.h"
#include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
diff --git a/chrome/browser/chromeos/login/screens/welcome_screen.h b/chrome/browser/chromeos/login/screens/welcome_screen.h
index 002649a..788f8b3 100644
--- a/chrome/browser/chromeos/login/screens/welcome_screen.h
+++ b/chrome/browser/chromeos/login/screens/welcome_screen.h
@@ -15,7 +15,7 @@
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/timer/timer.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_mode_detector.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_detector.h"
#include "chrome/browser/chromeos/login/screens/base_screen.h"
#include "chrome/browser/chromeos/login/wizard_context.h"
#include "ui/base/ime/chromeos/input_method_manager.h"
diff --git a/chrome/browser/chromeos/login/session/chrome_session_manager.cc b/chrome/browser/chromeos/login/session/chrome_session_manager.cc
index 03c829c5..bd7a9f6 100644
--- a/chrome/browser/chromeos/login/session/chrome_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/chrome_session_manager.cc
@@ -16,6 +16,8 @@
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_cryptohome_remover.h"
#include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
+#include "chrome/browser/ash/login/demo_mode/demo_resources.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
@@ -27,8 +29,6 @@
#include "chrome/browser/chromeos/child_accounts/screen_time_controller_factory.h"
#include "chrome/browser/chromeos/crostini/crostini_manager.h"
#include "chrome/browser/chromeos/lock_screen_apps/state_controller.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_resources.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/login_wizard.h"
#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h"
#include "chrome/browser/chromeos/login/screens/sync_consent_screen.h"
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index 24887e4..cd4b850 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -37,6 +37,9 @@
#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/ash/account_manager/account_manager_migrator.h"
#include "chrome/browser/ash/account_manager/account_manager_util.h"
+#include "chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.h"
+#include "chrome/browser/ash/login/demo_mode/demo_app_launcher.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
@@ -49,10 +52,7 @@
#include "chrome/browser/chromeos/first_run/first_run.h"
#include "chrome/browser/chromeos/full_restore/full_restore_service.h"
#include "chrome/browser/chromeos/logging.h"
-#include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
#include "chrome/browser/chromeos/login/chrome_restart_request.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_service.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
diff --git a/chrome/browser/chromeos/login/session/user_session_manager_test.cc b/chrome/browser/chromeos/login/session/user_session_manager_test.cc
index 52f4d65f..aaf90f18 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager_test.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager_test.cc
@@ -6,8 +6,8 @@
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/chromeos/login/test/device_state_mixin.h b/chrome/browser/chromeos/login/test/device_state_mixin.h
index aa87702..d004be5 100644
--- a/chrome/browser/chromeos/login/test/device_state_mixin.h
+++ b/chrome/browser/chromeos/login/test/device_state_mixin.h
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/test/local_state_mixin.h"
#include "chrome/browser/chromeos/login/test/scoped_policy_update.h"
#include "chrome/test/base/mixin_based_in_process_browser_test.h"
diff --git a/chrome/browser/chromeos/login/test/kiosk_test_helpers.h b/chrome/browser/chromeos/login/test/kiosk_test_helpers.h
index f60a45f..3a8e14e 100644
--- a/chrome/browser/chromeos/login/test/kiosk_test_helpers.h
+++ b/chrome/browser/chromeos/login/test/kiosk_test_helpers.h
@@ -9,7 +9,7 @@
#include "base/scoped_observer.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager_base.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager_observer.h"
-#include "chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h"
+#include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.h"
#include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/login/ui/login_display_host.h b/chrome/browser/chromeos/login/ui/login_display_host.h
index 9fd27b3..55616d3 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host.h
+++ b/chrome/browser/chromeos/login/ui/login_display_host.h
@@ -16,8 +16,8 @@
// TODO(https://crbug.com/1164001): move KioskAppId to forward declaration
// when moved to chrome/browser/ash/.
#include "chrome/browser/ash/app_mode/kiosk_app_types.h"
+#include "chrome/browser/ash/login/auth/auth_prewarmer.h"
#include "chrome/browser/chromeos/customization/customization_document.h"
-#include "chrome/browser/chromeos/login/auth/auth_prewarmer.h"
#include "chrome/browser/chromeos/login/oobe_screen.h"
#include "chrome/browser/chromeos/login/ui/login_display.h"
#include "chrome/browser/chromeos/login/ui/signin_ui.h"
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_common.cc b/chrome/browser/chromeos/login/ui/login_display_host_common.cc
index f690f3a..dcf01724 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_common.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_common.cc
@@ -9,14 +9,14 @@
#include "base/callback_helpers.h"
#include "base/feature_list.h"
#include "chrome/browser/ash/app_mode/kiosk_app_types.h"
+#include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/system/device_disabling_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/language_preferences.h"
-#include "chrome/browser/chromeos/login/app_mode/kiosk_launch_controller.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
#include "chrome/browser/chromeos/login/lock_screen_utils.h"
#include "chrome/browser/chromeos/login/screens/encryption_migration_screen.h"
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index d794060..8eb8c9b 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -34,6 +34,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
+#include "chrome/browser/ash/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/ash/system/timezone_resolver_manager.h"
#include "chrome/browser/ash/system/timezone_util.h"
@@ -43,7 +44,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/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_service.h"
#include "chrome/browser/chromeos/login/enterprise_user_session_metrics.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index c25137b..dd3b042 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -37,6 +37,8 @@
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
#include "chrome/browser/ash/app_mode/kiosk_app_types.h"
#include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/ash/system/device_disabling_manager.h"
#include "chrome/browser/ash/system/timezone_resolver_manager.h"
#include "chrome/browser/ash/system/timezone_util.h"
@@ -46,8 +48,6 @@
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/customization/customization_document.h"
#include "chrome/browser/chromeos/login/configuration_keys.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h"
#include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index cc02e2b..5ab2feecf 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -21,7 +21,7 @@
// TODO(https://crbug.com/1164001): move KioskAppType to forward declaration
// when moved to chrome/browser/ash/.
#include "chrome/browser/ash/app_mode/kiosk_app_types.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
#include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
#include "chrome/browser/chromeos/login/screen_manager.h"
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 47c8e3f7..cf89b71 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -20,10 +20,10 @@
#include "base/test/test_mock_time_task_runner.h"
#include "base/time/time.h"
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/base/locale_util.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
#include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
diff --git a/chrome/browser/chromeos/policy/enrollment_requisition_manager.cc b/chrome/browser/chromeos/policy/enrollment_requisition_manager.cc
index d5b65575..e7b2932 100644
--- a/chrome/browser/chromeos/policy/enrollment_requisition_manager.cc
+++ b/chrome/browser/chromeos/policy/enrollment_requisition_manager.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/chromeos/policy/enrollment_requisition_manager.h"
#include "base/logging.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/common/pref_names.h"
#include "chromeos/system/statistics_provider.h"
diff --git a/chrome/browser/chromeos/power/idle_action_warning_observer.cc b/chrome/browser/chromeos/power/idle_action_warning_observer.cc
index 3de71bf..441fa28 100644
--- a/chrome/browser/chromeos/power/idle_action_warning_observer.cc
+++ b/chrome/browser/chromeos/power/idle_action_warning_observer.cc
@@ -7,7 +7,7 @@
#include "ash/public/cpp/ash_pref_names.h"
#include "base/metrics/histogram_macros.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/power/idle_action_warning_dialog_view.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
index 7bb51fd..93f1f2c 100644
--- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
+++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -59,8 +59,8 @@
#include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
#include "components/arc/arc_service_manager.h"
#include "components/arc/arc_util.h"
diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc
index ae2c0474..5d7d97fd 100644
--- a/chrome/browser/extensions/api/management/management_api_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc
@@ -34,7 +34,7 @@
#include "extensions/test/extension_test_message_listener.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#endif
namespace keys = extension_management_api_constants;
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index 4605ebc..173812ce 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -69,8 +69,8 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/constants/ash_switches.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h"
#include "chrome/browser/extensions/updater/extension_cache_impl.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc
index 1e22753..fd182f8 100644
--- a/chrome/browser/extensions/external_provider_impl.cc
+++ b/chrome/browser/extensions/external_provider_impl.cc
@@ -55,12 +55,12 @@
#include "ash/constants/ash_paths.h"
#include "base/path_service.h"
#include "chrome/browser/ash/app_mode/kiosk_app_external_loader.h"
+#include "chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/chromeos/customization/customization_document.h"
#include "chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h"
#include "chrome/browser/chromeos/extensions/signin_screen_extensions_external_loader.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_extensions_external_loader.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/policy/device_local_account.h"
#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index 50a9c42..15a0664a 100644
--- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -42,11 +42,11 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/public/ash_interfaces.h"
#include "base/strings/stringprintf.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
#include "chrome/browser/chromeos/crosapi/browser_manager.h"
#include "chrome/browser/chromeos/crosapi/browser_util.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/login_pref_names.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/metrics/chromeos_metrics_provider.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 8bff755a..7ade2db 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -276,6 +276,10 @@
#include "chrome/browser/chromeos/extensions/printing/printing_api_handler.h"
#endif
#include "chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_detector.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/ash/system/automatic_reboot_manager.h"
#include "chrome/browser/ash/system/input_device_settings.h"
#include "chrome/browser/chromeos/borealis/borealis_prefs.h"
@@ -285,10 +289,6 @@
#include "chrome/browser/chromeos/full_restore/full_restore_prefs.h"
#include "chrome/browser/chromeos/guest_os/guest_os_pref_names.h"
#include "chrome/browser/chromeos/lock_screen_apps/state_controller.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_mode_detector.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_mode_resources_remover.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/quick_unlock/fingerprint_storage.h"
#include "chrome/browser/chromeos/login/quick_unlock/pin_storage_prefs.h"
#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index 7c47c31..794160f 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -13,7 +13,7 @@
#include "build/chromeos_buildflags.h"
#include "chrome/browser/browser_process.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#endif
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ui/app_list/app_list_client_impl_browsertest.cc b/chrome/browser/ui/app_list/app_list_client_impl_browsertest.cc
index e7c63c64..a0116ca 100644
--- a/chrome/browser/ui/app_list/app_list_client_impl_browsertest.cc
+++ b/chrome/browser/ui/app_list/app_list_client_impl_browsertest.cc
@@ -24,8 +24,8 @@
#include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
#include "chrome/browser/apps/app_service/launch_utils.h"
#include "chrome/browser/apps/platform_apps/app_browsertest_util.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
index fa323f87..e2fc4dd 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
@@ -22,10 +22,10 @@
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
#include "base/values.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"
#include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/session/user_session_manager.h"
#include "chrome/browser/image_decoder/image_decoder.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/app_list/chrome_app_list_item.cc b/chrome/browser/ui/app_list/chrome_app_list_item.cc
index 1352d56..10372d7 100644
--- a/chrome/browser/ui/app_list/chrome_app_list_item.cc
+++ b/chrome/browser/ui/app_list/chrome_app_list_item.cc
@@ -19,7 +19,7 @@
#include "ui/gfx/image/image_skia_operations.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#endif
namespace {
diff --git a/chrome/browser/ui/app_list/extension_app_utils.cc b/chrome/browser/ui/app_list/extension_app_utils.cc
index 1ef17c20c..09e13b5 100644
--- a/chrome/browser/ui/app_list/extension_app_utils.cc
+++ b/chrome/browser/ui/app_list/extension_app_utils.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/ui/app_list/extension_app_utils.h"
#include "ash/public/cpp/app_menu_constants.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/extensions/extension_ui_util.h"
#include "chrome/browser/web_applications/components/web_app_id_constants.h"
#include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc
index 6f2b889..29b97b2 100644
--- a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc
+++ b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc
@@ -10,8 +10,8 @@
#include "ash/constants/ash_features.h"
#include "ash/public/cpp/ambient/ambient_prefs.h"
#include "base/callback.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/common/channel_info.h"
diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.cc b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
index d3c5b82..0ef1b18 100644
--- a/chrome/browser/ui/ash/chrome_launcher_prefs.cc
+++ b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
@@ -14,9 +14,9 @@
#include "ash/public/cpp/app_list/internal_app_id_constants.h"
#include "ash/public/cpp/ash_pref_names.h"
#include "base/values.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/chromeos/crosapi/browser_util.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/prefs/pref_service_syncable_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index c0dda596..ea8934d 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -47,8 +47,8 @@
#include "chrome/browser/apps/platform_apps/app_browsertest_util.h"
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
#include "chrome/browser/ash/accessibility/speech_monitor.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/file_manager/file_manager_test_util.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_function_test_utils.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 72aa17f..1de0a2b 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -45,13 +45,13 @@
#include "chrome/browser/apps/app_service/app_service_proxy.h"
#include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
#include "chrome/browser/apps/app_service/app_service_test.h"
+#include "chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
#include "chrome/browser/chromeos/crostini/crostini_test_helper.h"
#include "chrome/browser/chromeos/crostini/crostini_util.h"
#include "chrome/browser/chromeos/file_manager/app_id.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_mode_test_helper.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.cc
index 8bcb8e4..f2c740a 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
#include "base/containers/contains.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/file_manager/app_id.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc b/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
index fa5e823..f317911 100644
--- a/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
@@ -10,13 +10,13 @@
#include "chrome/browser/apps/app_service/app_service_proxy.h"
#include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
#include "chrome/browser/apps/app_service/launch_utils.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/arc/session/arc_session_manager.h"
#include "chrome/browser/chromeos/crostini/crostini_features.h"
#include "chrome/browser/chromeos/crostini/crostini_shelf_utils.h"
#include "chrome/browser/chromeos/crostini/crostini_util.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/extensions/launch_util.h"
diff --git a/chrome/browser/ui/ash/session_controller_client_impl.cc b/chrome/browser/ui/ash/session_controller_client_impl.cc
index 61e06293..0058eec 100644
--- a/chrome/browser/ui/ash/session_controller_client_impl.cc
+++ b/chrome/browser/ui/ash/session_controller_client_impl.cc
@@ -15,10 +15,10 @@
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/app_mode/app_mode_utils.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.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/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
#include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
diff --git a/chrome/browser/ui/managed_ui.cc b/chrome/browser/ui/managed_ui.cc
index 8bc4328fd..952e123 100644
--- a/chrome/browser/ui/managed_ui.cc
+++ b/chrome/browser/ui/managed_ui.cc
@@ -13,9 +13,9 @@
#include "ui/base/l10n/l10n_util.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "ui/chromeos/devicetype_utils.h"
#endif
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index dc098fd..7c54da5 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -84,8 +84,8 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/constants/ash_switches.h"
#include "chrome/browser/ash/app_mode/app_launch_utils.h"
+#include "chrome/browser/ash/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/chromeos/full_restore/full_restore_service.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chromeos/cryptohome/cryptohome_parameters.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 6c2f1250..3d0d6375e 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -84,9 +84,9 @@
#include "base/base64.h"
#include "base/stl_util.h"
#include "base/strings/strcat.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
#include "chrome/browser/chromeos/customization/customization_document.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/component_updater/cros_component_manager.h"
#include "chromeos/system/statistics_provider.h"
diff --git a/chrome/browser/ui/webui/about_ui_unittest.cc b/chrome/browser/ui/webui/about_ui_unittest.cc
index 9fb55c8..a9e8f5c 100644
--- a/chrome/browser/ui/webui/about_ui_unittest.cc
+++ b/chrome/browser/ui/webui/about_ui_unittest.cc
@@ -19,7 +19,7 @@
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
#include "base/task/post_task.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/ui/fake_login_display_host.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/ui/webui/chromeos/login/demo_preferences_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_handler.cc b/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_handler.cc
index b575136c..d39fcb1 100644
--- a/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_handler.cc
@@ -9,8 +9,8 @@
#include "base/logging.h"
#include "base/macros.h"
#include "base/values.h"
+#include "chrome/browser/ash/login/auth/chrome_cryptohome_authenticator.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
#include "chrome/browser/chromeos/login/login_pref_names.h"
#include "chrome/browser/chromeos/login/saml/in_session_password_change_manager.h"
#include "chrome/browser/profiles/profile.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 da8302f1..79207a0 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -18,12 +18,12 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "build/branding_buildflags.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.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/login/configuration_keys.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/screens/reset_screen.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h
index e21cadb..7af6ffd 100644
--- a/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DEMO_SETUP_SCREEN_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DEMO_SETUP_SCREEN_HANDLER_H_
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index 9547e688..a203f9c5 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -7,7 +7,7 @@
#include <stddef.h>
#include "base/values.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
+#include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
#include "chrome/browser/chromeos/login/screens/network_screen.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/ui/webui/chromeos/cellular_setup/cellular_setup_localized_strings_provider.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index f8dcd561..2edd672 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -28,12 +28,12 @@
#include "base/threading/thread_task_runner_handle.h"
#include "base/trace_event/trace_event.h"
#include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ash/system/system_clock.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_service.h"
#include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
#include "chrome/browser/chromeos/login/help_app_launcher.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 f80bd544c..c43e8f6e 100644
--- a/chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.cc
@@ -17,10 +17,10 @@
#include "base/values.h"
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
#include "chrome/browser/ash/accessibility/magnification_manager.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.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/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/screens/welcome_screen.h"
#include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
#include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"
diff --git a/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc b/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc
index c76176e..794baf9 100644
--- a/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc
@@ -12,7 +12,7 @@
#include "ui/base/webui/web_ui_util.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#endif
namespace policy_indicator {
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_section.cc b/chrome/browser/ui/webui/settings/chromeos/device_section.cc
index b391c48..519773e 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_section.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_section.cc
@@ -16,7 +16,7 @@
#include "base/no_destructor.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
+#include "chrome/browser/ash/login/demo_mode/demo_session.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/browser/ui/webui/settings/chromeos/device_display_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 64fb55f..d2515e4 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2451,6 +2451,15 @@
"../browser/ash/app_mode/kiosk_app_update_service_browsertest.cc",
"../browser/ash/app_mode/kiosk_crash_restore_browsertest.cc",
"../browser/ash/app_mode/web_app/web_kiosk_app_data_browsertest.cc",
+ "../browser/ash/login/app_mode/auto_launched_kiosk_browsertest.cc",
+ "../browser/ash/login/app_mode/kiosk_browsertest.cc",
+ "../browser/ash/login/app_mode/kiosk_launch_controller_browsertest.cc",
+ "../browser/ash/login/app_mode/web_kiosk_browsertest.cc",
+ "../browser/ash/login/demo_mode/demo_app_launcher_browsertest.cc",
+ "../browser/ash/login/demo_mode/demo_session_browsertest.cc",
+ "../browser/ash/login/demo_mode/demo_setup_browsertest.cc",
+ "../browser/ash/login/demo_mode/demo_setup_test_utils.cc",
+ "../browser/ash/login/demo_mode/demo_setup_test_utils.h",
"../browser/ash/profiles/profile_helper_browsertest.cc",
"../browser/ash/system/device_disabling_browsertest.cc",
"../browser/ash/system/tray_accessibility_browsertest.cc",
@@ -2547,20 +2556,11 @@
"../browser/chromeos/logging_browsertest.cc",
"../browser/chromeos/login/accessibility_browsertest.cc",
"../browser/chromeos/login/active_directory_login_browsertest.cc",
- "../browser/chromeos/login/app_mode/auto_launched_kiosk_browsertest.cc",
- "../browser/chromeos/login/app_mode/kiosk_browsertest.cc",
- "../browser/chromeos/login/app_mode/kiosk_launch_controller_browsertest.cc",
- "../browser/chromeos/login/app_mode/web_kiosk_browsertest.cc",
"../browser/chromeos/login/arc_terms_of_service_browsertest.cc",
"../browser/chromeos/login/challenge_response_auth_keys_loader_browsertest.cc",
"../browser/chromeos/login/configuration_based_oobe_browsertest.cc",
"../browser/chromeos/login/crash_restore_browsertest.cc",
"../browser/chromeos/login/debug_overlay_browsertest.cc",
- "../browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc",
- "../browser/chromeos/login/demo_mode/demo_session_browsertest.cc",
- "../browser/chromeos/login/demo_mode/demo_setup_browsertest.cc",
- "../browser/chromeos/login/demo_mode/demo_setup_test_utils.cc",
- "../browser/chromeos/login/demo_mode/demo_setup_test_utils.h",
"../browser/chromeos/login/device_family_link_allowed_policy_browsertest.cc",
"../browser/chromeos/login/enable_debugging_browsertest.cc",
"../browser/chromeos/login/encryption_migration_browsertest.cc",
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index 2db87ea4..867c83b 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -11885,7 +11885,7 @@
},
{
'name': 'AllowWakeLocks',
- 'owners': ['file://chrome/browser/chromeos/login/demo_mode/OWNERS', '[email protected]'],
+ 'owners': ['file://chrome/browser/ash/login/demo_mode/OWNERS', '[email protected]'],
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:71-'],
@@ -19827,7 +19827,7 @@
},
{
'name': 'ScreenBrightnessPercent',
- 'owners': ['file://chrome/browser/chromeos/login/demo_mode/OWNERS', '[email protected]'],
+ 'owners': ['file://chrome/browser/ash/login/demo_mode/OWNERS', '[email protected]'],
'type': 'dict',
'schema': {
'type': 'object',
