Move //chrome/browser/{chromeos => ash}/child_accounts [1/3]
parent_access_code/ is moved to //chrome/browser/ash/child_accounts.
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Bug: 1164001
Change-Id: I760fdfaebef4ee9c53d820599ee42d53cbbb5b3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2810233
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Commit-Queue: Yeunjoo Choi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#870409}
diff --git a/chrome/browser/ash/child_accounts/OWNERS b/chrome/browser/ash/child_accounts/OWNERS
new file mode 100644
index 0000000..c28af4a
--- /dev/null
+++ b/chrome/browser/ash/child_accounts/OWNERS
@@ -0,0 +1,2 @@
[email protected]
[email protected]
diff --git a/chrome/browser/chromeos/child_accounts/parent_access_code/authenticator.cc b/chrome/browser/ash/child_accounts/parent_access_code/authenticator.cc
similarity index 98%
rename from chrome/browser/chromeos/child_accounts/parent_access_code/authenticator.cc
rename to chrome/browser/ash/child_accounts/parent_access_code/authenticator.cc
index f9a223f3..273bff50 100644
--- a/chrome/browser/chromeos/child_accounts/parent_access_code/authenticator.cc
+++ b/chrome/browser/ash/child_accounts/parent_access_code/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/child_accounts/parent_access_code/authenticator.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/authenticator.h"
#include <utility>
#include <vector>
diff --git a/chrome/browser/chromeos/child_accounts/parent_access_code/authenticator.h b/chrome/browser/ash/child_accounts/parent_access_code/authenticator.h
similarity index 94%
rename from chrome/browser/chromeos/child_accounts/parent_access_code/authenticator.h
rename to chrome/browser/ash/child_accounts/parent_access_code/authenticator.h
index df9d3c4..7d67e4d 100644
--- a/chrome/browser/chromeos/child_accounts/parent_access_code/authenticator.h
+++ b/chrome/browser/ash/child_accounts/parent_access_code/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_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_AUTHENTICATOR_H_
-#define CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_AUTHENTICATOR_H_
+#ifndef CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_AUTHENTICATOR_H_
+#define CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_AUTHENTICATOR_H_
#include <memory>
#include <ostream>
@@ -147,4 +147,4 @@
} // namespace parent_access
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_AUTHENTICATOR_H_
+#endif // CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_AUTHENTICATOR_H_
diff --git a/chrome/browser/chromeos/child_accounts/parent_access_code/authenticator_unittest.cc b/chrome/browser/ash/child_accounts/parent_access_code/authenticator_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/child_accounts/parent_access_code/authenticator_unittest.cc
rename to chrome/browser/ash/child_accounts/parent_access_code/authenticator_unittest.cc
index 1a9e62b..1d58c39e 100644
--- a/chrome/browser/chromeos/child_accounts/parent_access_code/authenticator_unittest.cc
+++ b/chrome/browser/ash/child_accounts/parent_access_code/authenticator_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/child_accounts/parent_access_code/authenticator.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/authenticator.h"
#include <map>
#include <string>
@@ -11,7 +11,7 @@
#include "base/numerics/safe_conversions.h"
#include "base/optional.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/child_accounts/parent_access_code/config_source.cc b/chrome/browser/ash/child_accounts/parent_access_code/config_source.cc
similarity index 96%
rename from chrome/browser/chromeos/child_accounts/parent_access_code/config_source.cc
rename to chrome/browser/ash/child_accounts/parent_access_code/config_source.cc
index 5d25133..37c0506 100644
--- a/chrome/browser/chromeos/child_accounts/parent_access_code/config_source.cc
+++ b/chrome/browser/ash/child_accounts/parent_access_code/config_source.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/child_accounts/parent_access_code/config_source.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/config_source.h"
#include <utility>
diff --git a/chrome/browser/chromeos/child_accounts/parent_access_code/config_source.h b/chrome/browser/ash/child_accounts/parent_access_code/config_source.h
similarity index 80%
rename from chrome/browser/chromeos/child_accounts/parent_access_code/config_source.h
rename to chrome/browser/ash/child_accounts/parent_access_code/config_source.h
index f29d9c5d9..67b77e8 100644
--- a/chrome/browser/chromeos/child_accounts/parent_access_code/config_source.h
+++ b/chrome/browser/ash/child_accounts/parent_access_code/config_source.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_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_CONFIG_SOURCE_H_
-#define CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_CONFIG_SOURCE_H_
+#ifndef CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_CONFIG_SOURCE_H_
+#define CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_CONFIG_SOURCE_H_
#include <map>
#include <memory>
@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/optional.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/authenticator.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/authenticator.h"
class AccountId;
@@ -58,4 +58,4 @@
} // namespace parent_access
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_CONFIG_SOURCE_H_
+#endif // CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_CONFIG_SOURCE_H_
diff --git a/chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.cc b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.cc
similarity index 97%
rename from chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.cc
rename to chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.cc
index bf3d3ce..8ad9b03 100644
--- a/chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.cc
+++ b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
#include <string>
#include <utility>
diff --git a/chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h
similarity index 88%
rename from chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h
rename to chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h
index ab5c77e..b0b0a8a 100644
--- a/chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h
+++ b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_SERVICE_H_
+#ifndef CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_SERVICE_H_
+#define CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_SERVICE_H_
#include <memory>
#include <string>
@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/no_destructor.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/config_source.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/config_source.h"
#include "chrome/browser/ui/ash/login_screen_client.h"
#include "components/account_id/account_id.h"
@@ -86,4 +86,4 @@
} // namespace parent_access
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_SERVICE_H_
+#endif // CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_SERVICE_H_
diff --git a/chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service_browsertest.cc b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
similarity index 97%
rename from chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service_browsertest.cc
rename to chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
index 9ab7d8a0..07bfdcf8 100644
--- a/chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service_browsertest.cc
+++ b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
@@ -11,12 +11,12 @@
#include "base/bind.h"
#include "base/json/json_writer.h"
#include "base/macros.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/config_source.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_test_utils.h"
#include "chrome/browser/ash/login/test/logged_in_user_mixin.h"
#include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/config_source.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.h"
#include "chrome/browser/chromeos/policy/user_policy_test_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/test/base/mixin_based_in_process_browser_test.h"
diff --git a/chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.cc b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_test_utils.cc
similarity index 93%
rename from chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.cc
rename to chrome/browser/ash/child_accounts/parent_access_code/parent_access_test_utils.cc
index cbeb168..3363a74 100644
--- a/chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.cc
+++ b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_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/child_accounts/parent_access_code/parent_access_test_utils.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.h b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_test_utils.h
similarity index 76%
rename from chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.h
rename to chrome/browser/ash/child_accounts/parent_access_code/parent_access_test_utils.h
index 5a014370..32e12940 100644
--- a/chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.h
+++ b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_test_utils.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_TEST_UTILS_H_
-#define CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_TEST_UTILS_H_
+#ifndef CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_TEST_UTILS_H_
+#define CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_TEST_UTILS_H_
#include <map>
#include <string>
#include "base/time/time.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/authenticator.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/config_source.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/authenticator.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/config_source.h"
namespace chromeos {
namespace parent_access {
@@ -41,4 +41,4 @@
} // namespace parent_access
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_TEST_UTILS_H_
+#endif // CHROME_BROWSER_ASH_CHILD_ACCOUNTS_PARENT_ACCESS_CODE_PARENT_ACCESS_TEST_UTILS_H_
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index b4425d1..68c6e41 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -974,6 +974,12 @@
"../ash/certificate_provider/sign_requests.h",
"../ash/certificate_provider/thread_safe_certificate_map.cc",
"../ash/certificate_provider/thread_safe_certificate_map.h",
+ "../ash/child_accounts/parent_access_code/authenticator.cc",
+ "../ash/child_accounts/parent_access_code/authenticator.h",
+ "../ash/child_accounts/parent_access_code/config_source.cc",
+ "../ash/child_accounts/parent_access_code/config_source.h",
+ "../ash/child_accounts/parent_access_code/parent_access_service.cc",
+ "../ash/child_accounts/parent_access_code/parent_access_service.h",
"../ash/crosapi/automation_ash.cc",
"../ash/crosapi/automation_ash.h",
"../ash/crosapi/browser_loader.cc",
@@ -1787,12 +1793,6 @@
"child_accounts/family_user_parental_control_metrics.h",
"child_accounts/family_user_session_metrics.cc",
"child_accounts/family_user_session_metrics.h",
- "child_accounts/parent_access_code/authenticator.cc",
- "child_accounts/parent_access_code/authenticator.h",
- "child_accounts/parent_access_code/config_source.cc",
- "child_accounts/parent_access_code/config_source.h",
- "child_accounts/parent_access_code/parent_access_service.cc",
- "child_accounts/parent_access_code/parent_access_service.h",
"child_accounts/screen_time_controller.cc",
"child_accounts/screen_time_controller.h",
"child_accounts/screen_time_controller_factory.cc",
@@ -3650,6 +3650,9 @@
"../ash/cert_provisioning/mock_cert_provisioning_worker.cc",
"../ash/cert_provisioning/mock_cert_provisioning_worker.h",
"../ash/certificate_provider/certificate_provider_service_unittest.cc",
+ "../ash/child_accounts/parent_access_code/authenticator_unittest.cc",
+ "../ash/child_accounts/parent_access_code/parent_access_test_utils.cc",
+ "../ash/child_accounts/parent_access_code/parent_access_test_utils.h",
"../ash/crosapi/browser_loader_unittest.cc",
"../ash/crosapi/browser_manager_unittest.cc",
"../ash/crosapi/browser_util_unittest.cc",
@@ -3798,9 +3801,6 @@
"child_accounts/family_user_metrics_service_unittest.cc",
"child_accounts/family_user_parental_control_metrics_unittest.cc",
"child_accounts/family_user_session_metrics_unittest.cc",
- "child_accounts/parent_access_code/authenticator_unittest.cc",
- "child_accounts/parent_access_code/parent_access_test_utils.cc",
- "child_accounts/parent_access_code/parent_access_test_utils.h",
"child_accounts/secondary_account_consent_logger_unittest.cc",
"child_accounts/time_limit_notifier_unittest.cc",
"child_accounts/time_limit_test_utils.cc",
diff --git a/chrome/browser/chromeos/child_accounts/OWNERS b/chrome/browser/chromeos/child_accounts/OWNERS
index c0c79f61..15c5917 100644
--- a/chrome/browser/chromeos/child_accounts/OWNERS
+++ b/chrome/browser/chromeos/child_accounts/OWNERS
@@ -1,2 +1,3 @@
[email protected]
[email protected]
\ No newline at end of file
+# TODO(https://crbug.com/1164001): Share OWNERS until the migration of
+# //chrome/browser/chromeos/child_accounts completes.
+file://chrome/browser/ash/child_accounts/OWNERS
\ No newline at end of file
diff --git a/chrome/browser/chromeos/child_accounts/screen_time_controller.h b/chrome/browser/chromeos/child_accounts/screen_time_controller.h
index f72e90b5..613d662 100644
--- a/chrome/browser/chromeos/child_accounts/screen_time_controller.h
+++ b/chrome/browser/chromeos/child_accounts/screen_time_controller.h
@@ -13,7 +13,7 @@
#include "base/observer_list_types.h"
#include "base/optional.h"
#include "base/time/time.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/chromeos/child_accounts/time_limit_notifier.h"
#include "chrome/browser/chromeos/child_accounts/usage_time_limit_processor.h"
#include "chrome/browser/chromeos/child_accounts/usage_time_state_notifier.h"
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 6e414c7f..7fa44c9 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -26,6 +26,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ash/accessibility/magnification_manager.h"
#include "chrome/browser/ash/base/locale_util.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/ash/crosapi/browser_util.h"
#include "chrome/browser/ash/drive/file_system_util.h"
#include "chrome/browser/ash/login/login_pref_names.h"
@@ -38,7 +39,6 @@
#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/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/chromeos/input_method/input_method_persistence.h"
#include "chrome/browser/chromeos/input_method/input_method_syncer.h"
#include "chrome/browser/chromeos/sync/split_settings_sync_field_trial.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index b34f14f0..245688a1 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -264,10 +264,10 @@
#include "chrome/browser/ash/arc/session/arc_session_manager.h"
#include "chrome/browser/ash/bluetooth/debug_logs_manager.h"
#include "chrome/browser/ash/cert_provisioning/cert_provisioning_common.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/chromeos/child_accounts/family_user_chrome_activity_metrics.h"
#include "chrome/browser/chromeos/child_accounts/family_user_metrics_service.h"
#include "chrome/browser/chromeos/child_accounts/family_user_session_metrics.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/chromeos/child_accounts/screen_time_controller.h"
#include "chrome/browser/chromeos/child_accounts/time_limits/app_activity_registry.h"
#include "chrome/browser/chromeos/child_accounts/time_limits/app_time_controller.h"
diff --git a/chrome/browser/ui/ash/login_screen_client.cc b/chrome/browser/ui/ash/login_screen_client.cc
index cb5fa2b1..f0664997 100644
--- a/chrome/browser/ui/ash/login_screen_client.cc
+++ b/chrome/browser/ui/ash/login_screen_client.cc
@@ -10,6 +10,7 @@
#include "ash/public/cpp/login_screen.h"
#include "ash/public/cpp/login_screen_model.h"
#include "base/bind.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/ash/login/existing_user_controller.h"
#include "chrome/browser/ash/login/help_app_launcher.h"
#include "chrome/browser/ash/login/lock/screen_locker.h"
@@ -21,7 +22,6 @@
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/login/ui/user_adding_screen.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/profiles/profile_metrics.h"
#include "chrome/browser/ui/ash/wallpaper_controller_client_impl.h"
diff --git a/chrome/browser/ui/webui/chromeos/set_time_ui.cc b/chrome/browser/ui/webui/chromeos/set_time_ui.cc
index 7425e78..631973e 100644
--- a/chrome/browser/ui/webui/chromeos/set_time_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/set_time_ui.cc
@@ -16,9 +16,9 @@
#include "base/macros.h"
#include "base/scoped_observation.h"
#include "base/values.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/system/timezone_util.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/chromeos/set_time_dialog.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/webui_util.h"
diff --git a/chrome/browser/ui/webui/settings/chromeos/date_time_handler.cc b/chrome/browser/ui/webui/settings/chromeos/date_time_handler.cc
index 1c5867a6..17b4267 100644
--- a/chrome/browser/ui/webui/settings/chromeos/date_time_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/date_time_handler.cc
@@ -11,11 +11,11 @@
#include "base/command_line.h"
#include "base/time/time.h"
#include "base/values.h"
+#include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.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/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/child_accounts/parent_access_code/parent_access_service.h"
#include "chrome/browser/chromeos/set_time_dialog.h"
#include "chrome/common/pref_names.h"
#include "chromeos/dbus/system_clock/system_clock_client.h"
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 74a4e6c..dde30685 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2474,6 +2474,9 @@
"../browser/ash/arc/user_session/arc_user_session_service_browsertest.cc",
"../browser/ash/attestation/attestation_policy_browsertest.cc",
"../browser/ash/base/locale_util_browsertest.cc",
+ "../browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc",
+ "../browser/ash/child_accounts/parent_access_code/parent_access_test_utils.cc",
+ "../browser/ash/child_accounts/parent_access_code/parent_access_test_utils.h",
"../browser/ash/drive/drive_integration_service_browsertest.cc",
"../browser/ash/lock_screen_apps/note_taking_browsertest.cc",
"../browser/ash/login/accessibility_browsertest.cc",
@@ -2637,9 +2640,6 @@
"../browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service_browsertest.cc",
"../browser/chrome_main_browsertest.cc",
"../browser/chromeos/child_accounts/family_user_device_metrics_browsertest.cc",
- "../browser/chromeos/child_accounts/parent_access_code/parent_access_service_browsertest.cc",
- "../browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.cc",
- "../browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.h",
"../browser/chromeos/child_accounts/screen_time_controller_browsertest.cc",
"../browser/chromeos/child_accounts/time_limit_test_utils.cc",
"../browser/chromeos/child_accounts/time_limits/app_time_browsertest.cc",
