From e18402d2cc46573d524e4641ec607b01210a3648 Mon Sep 17 00:00:00 2001 From: Yeunjoo Choi Date: Mon, 8 Aug 2022 07:41:43 +0000 Subject: [PATCH] Move //chromeos/{=>ash/components}/dbus/cryptohome And the moved files are migrated from namespace chromeos to ash. This CL is part of the Chrome OS source code directory migration: https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE. Change-Id: I037ff9893ae56cc8730f6eb453d48d69cd3c3bf0 Bug: 1164001 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3791931 Reviewed-by: Hidehiko Abe Owners-Override: Hidehiko Abe Commit-Queue: Yeunjoo Choi Cr-Commit-Position: refs/heads/main@{#1032457} --- ash/components/arc/BUILD.gn | 2 +- .../arc/disk_quota/arc_disk_quota_bridge.h | 2 +- ash/components/cryptohome/BUILD.gn | 6 +++--- ash/components/cryptohome/cryptohome_parameters.cc | 2 +- ash/components/cryptohome/cryptohome_parameters.h | 2 +- ash/components/cryptohome/cryptohome_util.cc | 4 ++-- ash/components/cryptohome/cryptohome_util.h | 4 ++-- .../cryptohome/cryptohome_util_unittest.cc | 4 ++-- ash/components/cryptohome/system_salt_getter.h | 2 +- ash/components/cryptohome/userdataauth_util.h | 6 +++--- ash/components/login/auth/BUILD.gn | 8 ++++---- ash/components/login/auth/auth_factor_editor.h | 2 +- ash/components/login/auth/auth_performer.cc | 4 ++-- ash/components/login/auth/auth_performer.h | 2 +- .../login/auth/auth_performer_unittest.cc | 2 +- .../login/auth/auth_session_authenticator.cc | 2 +- .../login/auth/auth_session_authenticator.h | 2 +- .../auth/auth_session_authenticator_unittest.cc | 6 +++--- .../login/auth/cryptohome_authenticator.h | 2 +- ash/components/login/auth/extended_authenticator.h | 2 +- .../login/auth/extended_authenticator_impl.h | 2 +- ash/components/login/auth/mount_performer.h | 2 +- .../login/auth/public/cryptohome_error.h | 2 +- ash/components/login/auth/stub_authenticator.cc | 2 +- ash/components/login/session/BUILD.gn | 6 +++--- .../login/session/session_termination_manager.h | 2 +- ash/components/tpm/BUILD.gn | 8 ++++---- ash/components/tpm/tpm_token_info_getter.h | 2 +- chrome/browser/BUILD.gn | 2 +- chrome/browser/ash/BUILD.gn | 4 ++-- .../ash/attestation/platform_verification_flow.cc | 4 ++-- .../platform_verification_flow_unittest.cc | 2 +- .../soft_bind_attestation_flow_unittest.cc | 2 +- chrome/browser/ash/crosapi/cert_database_ash.h | 2 +- .../cryptohome_key_delegate_service_provider.cc | 4 ++-- ...me_key_delegate_service_provider_browsertest.cc | 4 ++-- .../auth/cryptohome_authenticator_unittest.cc | 4 ++-- .../easy_unlock_create_keys_operation.h | 2 +- .../easy_unlock/easy_unlock_get_keys_operation.h | 4 ++-- .../easy_unlock_remove_keys_operation.h | 2 +- .../ash/login/encryption_migration_browsertest.cc | 4 ++-- .../login/enrollment/auto_enrollment_controller.cc | 2 +- .../login/enrollment/auto_enrollment_controller.h | 2 +- chrome/browser/ash/login/oobe_browsertest.cc | 4 ++-- .../ash/login/password_change_browsertest.cc | 2 +- .../pin_storage_cryptohome_unittest.cc | 2 +- chrome/browser/ash/login/saml/saml_browsertest.cc | 4 ++-- .../login/screens/encryption_migration_screen.h | 2 +- .../encryption_migration_screen_unittest.cc | 2 +- .../ash/login/screens/user_selection_screen.h | 2 +- .../ash/login/security_token_login_browsertest.cc | 4 ++-- .../ash/login/shill_profile_loading_browsertest.cc | 2 +- chrome/browser/ash/login/test/cryptohome_mixin.cc | 2 +- chrome/browser/ash/login/test/cryptohome_mixin.h | 2 +- chrome/browser/ash/login/test/user_policy_mixin.cc | 2 +- .../ash/login/users/chrome_user_manager_impl.cc | 4 ++-- .../ash/policy/core/cached_policy_key_loader.h | 2 +- .../core/user_cloud_policy_store_ash_unittest.cc | 2 +- .../ash/policy/enrollment/enrollment_handler.cc | 2 +- .../tpm_enrollment_key_signing_service.cc | 4 ++-- .../tpm_enrollment_key_signing_service_unittest.cc | 2 +- .../policy/handlers/lock_to_single_user_manager.h | 2 +- .../handlers/powerwash_requirements_checker.cc | 2 +- .../browser/ash/policy/rsu/lookup_key_uploader.cc | 2 +- .../browser/ash/policy/rsu/lookup_key_uploader.h | 2 +- .../status_collector/device_status_collector.cc | 2 +- chrome/browser/ash/profiles/profile_helper.cc | 2 +- chrome/browser/chromeos/BUILD.gn | 14 +++++++------- .../extensions/login_screen/login/login_apitest.cc | 2 +- chrome/browser/extensions/BUILD.gn | 2 +- chrome/browser/ui/BUILD.gn | 4 ++-- .../ui/webui/chromeos/cryptohome_web_ui_handler.cc | 2 +- .../settings/ash/calculator/size_calculator.h | 4 ++-- chrome/test/BUILD.gn | 4 ++-- chromeos/ash/components/dbus/BUILD.gn | 2 ++ chromeos/ash/components/dbus/authpolicy/BUILD.gn | 2 +- .../dbus/authpolicy/fake_authpolicy_client.cc | 2 +- .../{ => ash/components}/dbus/cryptohome/BUILD.gn | 9 +++++---- .../{ => ash/components}/dbus/cryptohome/OWNERS | 0 .../cryptohome/account_identifier_operators.cc | 2 +- .../dbus/cryptohome/account_identifier_operators.h | 8 ++++---- .../components}/dbus/cryptohome/attestation.proto | 2 +- chromeos/ash/components/dbus/debug_daemon/BUILD.gn | 4 ++-- .../dbus/debug_daemon/debug_daemon_client.cc | 2 +- chromeos/ash/components/dbus/gnubby/BUILD.gn | 2 +- .../dbus/gnubby/fake_gnubby_client_unittest.cc | 2 +- .../ash/components/dbus/session_manager/BUILD.gn | 4 ++-- .../session_manager/fake_session_manager_client.cc | 2 +- .../dbus/session_manager/session_manager_client.cc | 2 +- chromeos/ash/components/dbus/userdataauth/BUILD.gn | 8 ++++---- .../dbus/userdataauth/arc_quota_client.h | 4 ++-- .../dbus/userdataauth/arc_quota_client_unittest.cc | 2 +- .../dbus/userdataauth/cryptohome_misc_client.h | 4 ++-- .../cryptohome_misc_client_unittest.cc | 2 +- .../dbus/userdataauth/cryptohome_pkcs11_client.h | 4 ++-- .../cryptohome_pkcs11_client_unittest.cc | 2 +- .../dbus/userdataauth/fake_arc_quota_client.h | 2 +- .../userdataauth/fake_cryptohome_misc_client.h | 2 +- .../userdataauth/fake_cryptohome_pkcs11_client.h | 2 +- .../userdataauth/fake_install_attributes_client.cc | 2 +- .../userdataauth/fake_install_attributes_client.h | 2 +- .../dbus/userdataauth/fake_userdataauth_client.cc | 4 ++-- .../dbus/userdataauth/fake_userdataauth_client.h | 6 +++--- .../dbus/userdataauth/install_attributes_client.h | 4 ++-- .../install_attributes_client_unittest.cc | 2 +- .../dbus/userdataauth/userdataauth_client.h | 4 ++-- .../userdataauth/userdataauth_client_unittest.cc | 2 +- .../ash/components/install_attributes/BUILD.gn | 4 ++-- chromeos/ash/components/install_attributes/DEPS | 1 + .../install_attributes/install_attributes.cc | 4 ++-- .../install_attributes_unittest.cc | 2 +- chromeos/dbus/BUILD.gn | 2 -- 112 files changed, 172 insertions(+), 170 deletions(-) rename chromeos/{ => ash/components}/dbus/cryptohome/BUILD.gn (74%) rename chromeos/{ => ash/components}/dbus/cryptohome/OWNERS (100%) rename chromeos/{ => ash/components}/dbus/cryptohome/account_identifier_operators.cc (84%) rename chromeos/{ => ash/components}/dbus/cryptohome/account_identifier_operators.h (65%) rename chromeos/{ => ash/components}/dbus/cryptohome/attestation.proto (93%) diff --git a/ash/components/arc/BUILD.gn b/ash/components/arc/BUILD.gn index 19e80b91f3241..ad8aa70c24242 100644 --- a/ash/components/arc/BUILD.gn +++ b/ash/components/arc/BUILD.gn @@ -128,6 +128,7 @@ static_library("arc") { "//chromeos/ash/components/dbus/arc", "//chromeos/ash/components/dbus/concierge", "//chromeos/ash/components/dbus/concierge:concierge_proto", + "//chromeos/ash/components/dbus/cryptohome", "//chromeos/ash/components/dbus/patchpanel", "//chromeos/ash/components/dbus/patchpanel:patchpanel_proto", "//chromeos/ash/components/dbus/resourced", @@ -140,7 +141,6 @@ static_library("arc") { "//chromeos/components/disks:prefs", "//chromeos/components/sensors:sensors", "//chromeos/dbus", - "//chromeos/dbus/cryptohome", "//chromeos/dbus/permission_broker", "//chromeos/dbus/power", "//chromeos/dbus/power:power_manager_proto", diff --git a/ash/components/arc/disk_quota/arc_disk_quota_bridge.h b/ash/components/arc/disk_quota/arc_disk_quota_bridge.h index 2f96e6901343e..2da8afea5224a 100644 --- a/ash/components/arc/disk_quota/arc_disk_quota_bridge.h +++ b/ash/components/arc/disk_quota/arc_disk_quota_bridge.h @@ -7,7 +7,7 @@ #include "ash/components/arc/mojom/disk_quota.mojom.h" #include "base/memory/weak_ptr.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "components/account_id/account_id.h" #include "components/keyed_service/core/keyed_service.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/ash/components/cryptohome/BUILD.gn b/ash/components/cryptohome/BUILD.gn index 8a949f838fea7..28cf7ac63fadb 100644 --- a/ash/components/cryptohome/BUILD.gn +++ b/ash/components/cryptohome/BUILD.gn @@ -12,11 +12,11 @@ component("cryptohome") { deps = [ "//ash/components/login/auth/public:challenge_response_key", "//base", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/userdataauth:userdataauth", "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", "//chromeos/dbus/common", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//components/account_id", "//components/device_event_log", "//components/user_manager", @@ -41,10 +41,10 @@ source_set("unit_tests") { "//ash/components/login/auth/public:challenge_response_key", "//base", "//base/test:test_support", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/userdataauth:userdataauth", "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", "//chromeos/dbus:test_support", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//testing/gtest:gtest", ] sources = [ diff --git a/ash/components/cryptohome/cryptohome_parameters.cc b/ash/components/cryptohome/cryptohome_parameters.cc index 8615ff35c816c..1e549ce460930 100644 --- a/ash/components/cryptohome/cryptohome_parameters.cc +++ b/ash/components/cryptohome/cryptohome_parameters.cc @@ -12,7 +12,7 @@ #include "ash/components/cryptohome/common_types.h" #include "base/memory/values_equivalent.h" #include "base/notreached.h" -#include "chromeos/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" #include "components/account_id/account_id.h" #include "components/user_manager/known_user.h" diff --git a/ash/components/cryptohome/cryptohome_parameters.h b/ash/components/cryptohome/cryptohome_parameters.h index b1bc6839a4814..dda1b918c3bb1 100644 --- a/ash/components/cryptohome/cryptohome_parameters.h +++ b/ash/components/cryptohome/cryptohome_parameters.h @@ -14,7 +14,7 @@ #include "ash/components/cryptohome/common_types.h" #include "ash/components/login/auth/public/challenge_response_key.h" #include "base/component_export.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" class AccountId; diff --git a/ash/components/cryptohome/cryptohome_util.cc b/ash/components/cryptohome/cryptohome_util.cc index 226f026e222af..faef3dfc8f519 100644 --- a/ash/components/cryptohome/cryptohome_util.cc +++ b/ash/components/cryptohome/cryptohome_util.cc @@ -14,9 +14,9 @@ #include "ash/components/cryptohome/userdataauth_util.h" #include "base/logging.h" #include "base/notreached.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/constants/cryptohome_key_delegate_constants.h" -#include "chromeos/dbus/cryptohome/key.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/device_event_log/device_event_log.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/ash/components/cryptohome/cryptohome_util.h b/ash/components/cryptohome/cryptohome_util.h index 0db1f9a338701..d52fb8c6f6545 100644 --- a/ash/components/cryptohome/cryptohome_util.h +++ b/ash/components/cryptohome/cryptohome_util.h @@ -10,8 +10,8 @@ #include "ash/components/cryptohome/common_types.h" #include "ash/components/cryptohome/cryptohome_parameters.h" #include "base/component_export.h" -#include "chromeos/dbus/cryptohome/key.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "third_party/cros_system_api/dbus/service_constants.h" namespace cryptohome { diff --git a/ash/components/cryptohome/cryptohome_util_unittest.cc b/ash/components/cryptohome/cryptohome_util_unittest.cc index 84edf333d172c..2190ab50f6840 100644 --- a/ash/components/cryptohome/cryptohome_util_unittest.cc +++ b/ash/components/cryptohome/cryptohome_util_unittest.cc @@ -9,8 +9,8 @@ #include "ash/components/cryptohome/common_types.h" #include "ash/components/cryptohome/cryptohome_parameters.h" #include "ash/components/login/auth/public/challenge_response_key.h" -#include "chromeos/dbus/cryptohome/key.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/ash/components/cryptohome/system_salt_getter.h b/ash/components/cryptohome/system_salt_getter.h index fa9b057615a5e..9fe74d53e82fb 100644 --- a/ash/components/cryptohome/system_salt_getter.h +++ b/ash/components/cryptohome/system_salt_getter.h @@ -13,7 +13,7 @@ #include "base/callback_forward.h" #include "base/component_export.h" #include "base/memory/weak_ptr.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace ash { diff --git a/ash/components/cryptohome/userdataauth_util.h b/ash/components/cryptohome/userdataauth_util.h index 3c554faa998a5..f3ad289a68a7f 100644 --- a/ash/components/cryptohome/userdataauth_util.h +++ b/ash/components/cryptohome/userdataauth_util.h @@ -7,9 +7,9 @@ #include "ash/components/cryptohome/cryptohome_parameters.h" #include "base/component_export.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/key.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/ash/components/login/auth/BUILD.gn b/ash/components/login/auth/BUILD.gn index 6a39c0036471c..448241762acc0 100644 --- a/ash/components/login/auth/BUILD.gn +++ b/ash/components/login/auth/BUILD.gn @@ -22,12 +22,12 @@ component("auth") { "//base:i18n", "//chromeos/ash/components/dbus/authpolicy", "//chromeos/ash/components/dbus/authpolicy:authpolicy_proto", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/session_manager", "//chromeos/ash/components/dbus/userdataauth", "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", "//chromeos/dbus/constants", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/login/login_state", "//chromeos/metrics", "//components/account_id", @@ -126,11 +126,11 @@ source_set("unit_tests") { "//base:i18n", "//chromeos/ash/components/dbus/authpolicy", "//chromeos/ash/components/dbus/authpolicy:authpolicy_proto", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/userdataauth", "//chromeos/ash/components/dbus/userdataauth:test_support", "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//components/account_id", "//components/password_manager/core/browser:password_hash_data", "//components/prefs", diff --git a/ash/components/login/auth/auth_factor_editor.h b/ash/components/login/auth/auth_factor_editor.h index 7d91967baab19..13afa5bfa02c8 100644 --- a/ash/components/login/auth/auth_factor_editor.h +++ b/ash/components/login/auth/auth_factor_editor.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/component_export.h" #include "base/memory/weak_ptr.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace ash { diff --git a/ash/components/login/auth/auth_performer.cc b/ash/components/login/auth/auth_performer.cc index 33d2040bd063d..3bd62ff4fa886 100644 --- a/ash/components/login/auth/auth_performer.cc +++ b/ash/components/login/auth/auth_performer.cc @@ -16,9 +16,9 @@ #include "base/check.h" #include "base/notreached.h" #include "base/time/time.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/key.pb.h" #include "components/device_event_log/device_event_log.h" #include "components/user_manager/user_type.h" diff --git a/ash/components/login/auth/auth_performer.h b/ash/components/login/auth/auth_performer.h index d848655589585..813fead65fa75 100644 --- a/ash/components/login/auth/auth_performer.h +++ b/ash/components/login/auth/auth_performer.h @@ -14,8 +14,8 @@ #include "base/component_export.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace ash { diff --git a/ash/components/login/auth/auth_performer_unittest.cc b/ash/components/login/auth/auth_performer_unittest.cc index 13167ad7f5f21..c8fc9fc44b46d 100644 --- a/ash/components/login/auth/auth_performer_unittest.cc +++ b/ash/components/login/auth/auth_performer_unittest.cc @@ -17,10 +17,10 @@ #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "base/test/test_future.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h" #include "chromeos/ash/components/dbus/userdataauth/mock_userdataauth_client.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" #include "components/account_id/account_id.h" #include "components/user_manager/user_type.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ash/components/login/auth/auth_session_authenticator.cc b/ash/components/login/auth/auth_session_authenticator.cc index ecb2a242740b5..c8d059cf1a851 100644 --- a/ash/components/login/auth/auth_session_authenticator.cc +++ b/ash/components/login/auth/auth_session_authenticator.cc @@ -20,8 +20,8 @@ #include "base/debug/crash_logging.h" #include "base/debug/dump_without_crashing.h" #include "base/notreached.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" #include "components/device_event_log/device_event_log.h" #include "components/user_manager/known_user.h" #include "components/user_manager/user_names.h" diff --git a/ash/components/login/auth/auth_session_authenticator.h b/ash/components/login/auth/auth_session_authenticator.h index 65c739c5322c6..1b011f0fab608 100644 --- a/ash/components/login/auth/auth_session_authenticator.h +++ b/ash/components/login/auth/auth_session_authenticator.h @@ -18,7 +18,7 @@ #include "base/callback.h" #include "base/component_export.h" #include "base/memory/weak_ptr.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "components/account_id/account_id.h" #include "components/user_manager/user_type.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/ash/components/login/auth/auth_session_authenticator_unittest.cc b/ash/components/login/auth/auth_session_authenticator_unittest.cc index 83967d4b4e652..af73861bef0c6 100644 --- a/ash/components/login/auth/auth_session_authenticator_unittest.cc +++ b/ash/components/login/auth/auth_session_authenticator_unittest.cc @@ -22,12 +22,12 @@ #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "base/test/test_future.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h" #include "chromeos/ash/components/dbus/userdataauth/mock_userdataauth_client.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/key.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" #include "components/user_manager/user_type.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/ash/components/login/auth/cryptohome_authenticator.h b/ash/components/login/auth/cryptohome_authenticator.h index a10e34006d566..76fdf98e5b4d0 100644 --- a/ash/components/login/auth/cryptohome_authenticator.h +++ b/ash/components/login/auth/cryptohome_authenticator.h @@ -19,7 +19,7 @@ #include "base/memory/raw_ptr.h" #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "google_apis/gaia/gaia_auth_consumer.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/ash/components/login/auth/extended_authenticator.h b/ash/components/login/auth/extended_authenticator.h index 8ec5760b1b071..44e05e605df4c 100644 --- a/ash/components/login/auth/extended_authenticator.h +++ b/ash/components/login/auth/extended_authenticator.h @@ -13,7 +13,7 @@ #include "base/compiler_specific.h" #include "base/component_export.h" #include "base/memory/ref_counted.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" namespace ash { diff --git a/ash/components/login/auth/extended_authenticator_impl.h b/ash/components/login/auth/extended_authenticator_impl.h index 34c0ed0b26662..b9c0056a48546 100644 --- a/ash/components/login/auth/extended_authenticator_impl.h +++ b/ash/components/login/auth/extended_authenticator_impl.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/component_export.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/ash/components/login/auth/mount_performer.h b/ash/components/login/auth/mount_performer.h index a205f54e7aaee..26642fab29f66 100644 --- a/ash/components/login/auth/mount_performer.h +++ b/ash/components/login/auth/mount_performer.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/component_export.h" #include "base/memory/weak_ptr.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace ash { diff --git a/ash/components/login/auth/public/cryptohome_error.h b/ash/components/login/auth/public/cryptohome_error.h index dc370bb084f2d..56ef4f2fc2f68 100644 --- a/ash/components/login/auth/public/cryptohome_error.h +++ b/ash/components/login/auth/public/cryptohome_error.h @@ -7,7 +7,7 @@ #include "ash/components/login/auth/public/auth_failure.h" #include "base/component_export.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" namespace ash { diff --git a/ash/components/login/auth/stub_authenticator.cc b/ash/components/login/auth/stub_authenticator.cc index a8638ca8d6c36..94cdd6459477f 100644 --- a/ash/components/login/auth/stub_authenticator.cc +++ b/ash/components/login/auth/stub_authenticator.cc @@ -14,7 +14,7 @@ namespace ash { namespace { -// As defined in /chromeos/dbus/cryptohome/cryptohome_client.cc. +// As defined in /chromeos/ash/components/dbus/cryptohome/cryptohome_client.cc. static const char kUserIdHashSuffix[] = "-hash"; } // anonymous namespace diff --git a/ash/components/login/session/BUILD.gn b/ash/components/login/session/BUILD.gn index 8ed3f25b98273..5c5ba0bea235a 100644 --- a/ash/components/login/session/BUILD.gn +++ b/ash/components/login/session/BUILD.gn @@ -11,11 +11,11 @@ component("session") { defines = [ "IS_ASH_LOGIN_SESSION_IMPL" ] deps = [ "//base", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/session_manager", "//chromeos/ash/components/dbus/userdataauth", "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", - "//chromeos/dbus/cryptohome:cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/power:power", "//third_party/protobuf:protobuf_lite", ] @@ -30,9 +30,9 @@ source_set("unit_tests") { deps = [ "//ash/components/login/session:session", "//base", + "//chromeos/ash/components/dbus/cryptohome", "//chromeos/ash/components/dbus/session_manager", "//chromeos/ash/components/dbus/userdataauth", - "//chromeos/dbus/cryptohome:cryptohome", "//chromeos/dbus/power:power", "//testing/gtest", ] diff --git a/ash/components/login/session/session_termination_manager.h b/ash/components/login/session/session_termination_manager.h index 0265e1d7f58fd..c60e4bb60685e 100644 --- a/ash/components/login/session/session_termination_manager.h +++ b/ash/components/login/session/session_termination_manager.h @@ -8,7 +8,7 @@ #include "base/component_export.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/cros_system_api/dbus/login_manager/dbus-constants.h" diff --git a/ash/components/tpm/BUILD.gn b/ash/components/tpm/BUILD.gn index 1da457b16ddba..30baff9780aa8 100644 --- a/ash/components/tpm/BUILD.gn +++ b/ash/components/tpm/BUILD.gn @@ -20,11 +20,11 @@ component("tpm") { ":buildflags", "//ash/components/cryptohome", "//base", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/userdataauth", "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", "//chromeos/dbus/constants", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/tpm_manager", "//chromeos/dbus/tpm_manager:tpm_manager_proto", "//chromeos/login/login_state", @@ -47,12 +47,12 @@ source_set("unit_tests") { ":tpm", "//ash/components/cryptohome", "//base/test:test_support", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/userdataauth:userdataauth", "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", "//chromeos/dbus:test_support", "//chromeos/dbus/constants", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/tpm_manager", "//chromeos/dbus/tpm_manager:tpm_manager_proto", "//testing/gtest", diff --git a/ash/components/tpm/tpm_token_info_getter.h b/ash/components/tpm/tpm_token_info_getter.h index 62a6364af3d90..437442ec29d5b 100644 --- a/ash/components/tpm/tpm_token_info_getter.h +++ b/ash/components/tpm/tpm_token_info_getter.h @@ -13,8 +13,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" #include "chromeos/dbus/tpm_manager/tpm_manager.pb.h" #include "components/account_id/account_id.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 7f20e675df29d..42f789d43b0b4 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -5190,6 +5190,7 @@ static_library("browser") { "//chromeos/ash/components/dbus/attestation:attestation_proto", "//chromeos/ash/components/dbus/concierge", "//chromeos/ash/components/dbus/cros_disks", + "//chromeos/ash/components/dbus/cryptohome", "//chromeos/ash/components/dbus/image_loader", "//chromeos/ash/components/dbus/session_manager", "//chromeos/ash/components/dbus/update_engine", @@ -5213,7 +5214,6 @@ static_library("browser") { "//chromeos/crosapi/cpp:crosapi_constants", "//chromeos/crosapi/mojom", "//chromeos/dbus", - "//chromeos/dbus/cryptohome", "//chromeos/dbus/tpm_manager", "//chromeos/dbus/tpm_manager:tpm_manager_proto", "//chromeos/login/login_state", diff --git a/chrome/browser/ash/BUILD.gn b/chrome/browser/ash/BUILD.gn index 9c65e5298dac9..d082fe45617da 100644 --- a/chrome/browser/ash/BUILD.gn +++ b/chrome/browser/ash/BUILD.gn @@ -1579,6 +1579,7 @@ source_set("ash") { "//chromeos/ash/components/dbus/concierge", "//chromeos/ash/components/dbus/concierge:concierge_proto", "//chromeos/ash/components/dbus/cros_disks", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/debug_daemon", "//chromeos/ash/components/dbus/fusebox:proto", "//chromeos/ash/components/dbus/fwupd", @@ -1609,7 +1610,6 @@ source_set("ash") { "//chromeos/crosapi/mojom", "//chromeos/dbus/common", "//chromeos/dbus/constants", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/dlcservice", "//chromeos/dbus/missive", "//chromeos/dbus/power", @@ -1828,6 +1828,7 @@ source_set("ash") { "//chromeos/ash/components/dbus/biod:biod_proto", "//chromeos/ash/components/dbus/cdm_factory_daemon", "//chromeos/ash/components/dbus/cros_healthd", + "//chromeos/ash/components/dbus/cryptohome:attestation_proto", "//chromeos/ash/components/dbus/cups_proxy", "//chromeos/ash/components/dbus/easy_unlock", "//chromeos/ash/components/dbus/federated", @@ -1865,7 +1866,6 @@ source_set("ash") { "//chromeos/components/sync_wifi", "//chromeos/constants", "//chromeos/dbus", - "//chromeos/dbus/cryptohome:attestation_proto", "//chromeos/dbus/dlcservice:dlcservice_proto", "//chromeos/dbus/dlp", "//chromeos/dbus/dlp:dlp_proto", diff --git a/chrome/browser/ash/attestation/platform_verification_flow.cc b/chrome/browser/ash/attestation/platform_verification_flow.cc index 0d8898879904e..51e7fee46b196 100644 --- a/chrome/browser/ash/attestation/platform_verification_flow.cc +++ b/chrome/browser/ash/attestation/platform_verification_flow.cc @@ -23,9 +23,9 @@ #include "chrome/browser/ash/settings/cros_settings.h" #include "chrome/browser/permissions/permission_manager_factory.h" #include "chrome/browser/profiles/profile.h" +#include "chromeos/ash/components/dbus/attestation/attestation.pb.h" #include "chromeos/ash/components/dbus/attestation/attestation_client.h" #include "chromeos/ash/components/dbus/attestation/interface.pb.h" -#include "chromeos/dbus/attestation/attestation.pb.h" #include "chromeos/dbus/constants/dbus_switches.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "components/content_settings/core/browser/host_content_settings_map.h" @@ -305,7 +305,7 @@ void PlatformVerificationFlow::OnChallengeReady( ReportError(std::move(context).callback, INTERNAL_ERROR); return; } - chromeos::attestation::SignedData signed_data_pb; + SignedData signed_data_pb; if (reply.challenge_response().empty() || !signed_data_pb.ParseFromString(reply.challenge_response())) { LOG(ERROR) << "PlatformVerificationFlow: Failed to parse response data."; diff --git a/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc b/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc index 7fb4a905ba2ae..bc108f1956294 100644 --- a/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc +++ b/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc @@ -18,9 +18,9 @@ #include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h" #include "chrome/browser/profiles/profile_impl.h" #include "chrome/common/pref_names.h" +#include "chromeos/ash/components/dbus/attestation/attestation.pb.h" #include "chromeos/ash/components/dbus/attestation/fake_attestation_client.h" #include "chromeos/ash/components/dbus/attestation/interface.pb.h" -#include "chromeos/dbus/attestation/attestation.pb.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ash/attestation/soft_bind_attestation_flow_unittest.cc b/chrome/browser/ash/attestation/soft_bind_attestation_flow_unittest.cc index af3057b500682..0ebdd0d76d2bc 100644 --- a/chrome/browser/ash/attestation/soft_bind_attestation_flow_unittest.cc +++ b/chrome/browser/ash/attestation/soft_bind_attestation_flow_unittest.cc @@ -17,9 +17,9 @@ #include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h" #include "chrome/browser/profiles/profile_impl.h" #include "chrome/common/pref_names.h" +#include "chromeos/ash/components/dbus/attestation/attestation.pb.h" #include "chromeos/ash/components/dbus/attestation/fake_attestation_client.h" #include "chromeos/ash/components/dbus/attestation/interface.pb.h" -#include "chromeos/dbus/attestation/attestation.pb.h" #include "content/public/test/browser_task_environment.h" #include "crypto/rsa_private_key.h" #include "net/cert/x509_certificate.h" diff --git a/chrome/browser/ash/crosapi/cert_database_ash.h b/chrome/browser/ash/crosapi/cert_database_ash.h index b1a3fffc5d991..6feae794f84b9 100644 --- a/chrome/browser/ash/crosapi/cert_database_ash.h +++ b/chrome/browser/ash/crosapi/cert_database_ash.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_ASH_CROSAPI_CERT_DATABASE_ASH_H_ #include "base/memory/weak_ptr.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "chromeos/crosapi/mojom/cert_database.mojom.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" #include "chromeos/login/login_state/login_state.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver_set.h" diff --git a/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.cc b/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.cc index 26b88541411f4..6a74f4e6c5efb 100644 --- a/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.cc +++ b/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.cc @@ -18,8 +18,8 @@ #include "chrome/browser/certificate_provider/certificate_provider_service.h" #include "chrome/browser/certificate_provider/certificate_provider_service_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chromeos/dbus/cryptohome/key.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" #include "dbus/message.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider_browsertest.cc b/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider_browsertest.cc index 7189ae60f0a84..6053c39ff48cf 100644 --- a/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider_browsertest.cc +++ b/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider_browsertest.cc @@ -24,10 +24,10 @@ #include "chrome/browser/policy/extension_force_install_mixin.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/services/service_provider_test_helper.h" #include "chromeos/dbus/constants/cryptohome_key_delegate_constants.h" -#include "chromeos/dbus/cryptohome/key.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" #include "components/user_manager/user_names.h" #include "content/public/browser/browser_context.h" diff --git a/chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc index bab62f73d4a23..89c356abd2479 100644 --- a/chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc +++ b/chrome/browser/ash/login/auth/cryptohome_authenticator_unittest.cc @@ -38,10 +38,10 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "chromeos/ash/components/dbus/cros_disks/cros_disks_client.h" +#include "chromeos/ash/components/dbus/cryptohome/account_identifier_operators.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/fake_cryptohome_misc_client.h" #include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h" -#include "chromeos/dbus/cryptohome/account_identifier_operators.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/login/login_state/login_state.h" #include "components/ownership/mock_owner_key_util.h" #include "components/user_manager/scoped_user_manager.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h index d4903d4e9ac0c..f66b0995d75c3 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h @@ -14,7 +14,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_types.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h index 67987f22c9e45..97aa937fa5a49 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h @@ -11,8 +11,8 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_types.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h index 79d0688339135..f9686b762f1ae 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h @@ -10,7 +10,7 @@ #include "ash/components/login/auth/public/user_context.h" #include "base/callback.h" #include "base/memory/weak_ptr.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/chrome/browser/ash/login/encryption_migration_browsertest.cc b/chrome/browser/ash/login/encryption_migration_browsertest.cc index 4a15597bceccc..abaf4f50ce5aa 100644 --- a/chrome/browser/ash/login/encryption_migration_browsertest.cc +++ b/chrome/browser/ash/login/encryption_migration_browsertest.cc @@ -25,9 +25,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" +#include "chromeos/ash/components/dbus/cryptohome/account_identifier_operators.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h" -#include "chromeos/dbus/cryptohome/account_identifier_operators.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/power/fake_power_manager_client.h" #include "components/account_id/account_id.h" #include "components/user_manager/known_user.h" diff --git a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc index fa62c5d9b09a2..065e945524c9c 100644 --- a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc +++ b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc @@ -28,11 +28,11 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/net/system_network_context_manager.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/system_clock/system_clock_client.h" #include "chromeos/ash/components/dbus/system_clock/system_clock_sync_observation.h" #include "chromeos/ash/components/dbus/userdataauth/install_attributes_client.h" #include "chromeos/ash/components/install_attributes/install_attributes.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/system/statistics_provider.h" #include "components/device_event_log/device_event_log.h" diff --git a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h index e8d553ebabf07..b69503f8d8186 100644 --- a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h +++ b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h @@ -17,7 +17,7 @@ #include "chrome/browser/ash/policy/enrollment/private_membership/private_membership_rlwe_client.h" #include "chrome/browser/ash/policy/enrollment/private_membership/psm_rlwe_id_provider_impl.h" #include "chrome/browser/ash/settings/device_settings_service.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace ash { diff --git a/chrome/browser/ash/login/oobe_browsertest.cc b/chrome/browser/ash/login/oobe_browsertest.cc index d87a55982cee1..f902ac8644a05 100644 --- a/chrome/browser/ash/login/oobe_browsertest.cc +++ b/chrome/browser/ash/login/oobe_browsertest.cc @@ -36,9 +36,9 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h" -#include "chromeos/dbus/cryptohome/key.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" #include "components/user_manager/known_user.h" #include "components/user_manager/user.h" diff --git a/chrome/browser/ash/login/password_change_browsertest.cc b/chrome/browser/ash/login/password_change_browsertest.cc index d609ddda39ea9..c986e60e1950a 100644 --- a/chrome/browser/ash/login/password_change_browsertest.cc +++ b/chrome/browser/ash/login/password_change_browsertest.cc @@ -50,10 +50,10 @@ #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/test/base/interactive_test_utils.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "chromeos/ash/components/dbus/userdataauth/fake_cryptohome_misc_client.h" #include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" #include "components/account_id/account_id.h" #include "components/user_manager/known_user.h" #include "components/user_manager/user_manager.h" diff --git a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome_unittest.cc b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome_unittest.cc index 5fac29c12d54a..fbcd06f2b53ab 100644 --- a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome_unittest.cc +++ b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome_unittest.cc @@ -18,9 +18,9 @@ #include "chrome/browser/ash/login/quick_unlock/fake_pin_salt_storage.h" #include "chrome/browser/ash/login/quick_unlock/pin_backend.h" #include "chrome/browser/ash/login/quick_unlock/quick_unlock_utils.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/fake_cryptohome_misc_client.h" #include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ash/login/saml/saml_browsertest.cc b/chrome/browser/ash/login/saml/saml_browsertest.cc index 1981557ce25a9..e7c8cb55a254b 100644 --- a/chrome/browser/ash/login/saml/saml_browsertest.cc +++ b/chrome/browser/ash/login/saml/saml_browsertest.cc @@ -71,14 +71,14 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chromeos/ash/components/dbus/attestation/fake_attestation_client.h" #include "chromeos/ash/components/dbus/attestation/interface.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h" #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h" #include "chromeos/ash/components/dbus/userdataauth/fake_cryptohome_misc_client.h" #include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h" #include "chromeos/ash/components/install_attributes/stub_install_attributes.h" #include "chromeos/dbus/constants/attestation_constants.h" -#include "chromeos/dbus/cryptohome/key.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/shill/shill_manager_client.h" #include "components/account_id/account_id.h" #include "components/content_settings/core/browser/host_content_settings_map.h" diff --git a/chrome/browser/ash/login/screens/encryption_migration_screen.h b/chrome/browser/ash/login/screens/encryption_migration_screen.h index 4ec7aa392bd2e..75ce6e63bb407 100644 --- a/chrome/browser/ash/login/screens/encryption_migration_screen.h +++ b/chrome/browser/ash/login/screens/encryption_migration_screen.h @@ -19,8 +19,8 @@ #include "ash/components/cryptohome/cryptohome_parameters.h" #include "chrome/browser/ash/login/ui/login_feedback.h" #include "chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/power/power_manager_client.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/device/public/mojom/wake_lock.mojom.h" diff --git a/chrome/browser/ash/login/screens/encryption_migration_screen_unittest.cc b/chrome/browser/ash/login/screens/encryption_migration_screen_unittest.cc index 35300e3712f24..94f12801bbb0b 100644 --- a/chrome/browser/ash/login/screens/encryption_migration_screen_unittest.cc +++ b/chrome/browser/ash/login/screens/encryption_migration_screen_unittest.cc @@ -16,8 +16,8 @@ #include "chrome/browser/ash/login/users/mock_user_manager.h" #include "chrome/browser/ui/webui/chromeos/login/base_webui_handler.h" #include "chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.h" +#include "chromeos/ash/components/dbus/cryptohome/account_identifier_operators.h" #include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h" -#include "chromeos/dbus/cryptohome/account_identifier_operators.h" #include "chromeos/dbus/power/fake_power_manager_client.h" #include "chromeos/dbus/power/power_policy_controller.h" #include "components/account_id/account_id.h" diff --git a/chrome/browser/ash/login/screens/user_selection_screen.h b/chrome/browser/ash/login/screens/user_selection_screen.h index aaa814221ad9d..68b84677ad9b6 100644 --- a/chrome/browser/ash/login/screens/user_selection_screen.h +++ b/chrome/browser/ash/login/screens/user_selection_screen.h @@ -21,7 +21,7 @@ #include "chrome/browser/ash/login/ui/login_display.h" #include "chrome/browser/ash/login/user_online_signin_notifier.h" #include "chrome/browser/ash/system/system_clock.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" #include "components/session_manager/core/session_manager_observer.h" #include "components/user_manager/user.h" diff --git a/chrome/browser/ash/login/security_token_login_browsertest.cc b/chrome/browser/ash/login/security_token_login_browsertest.cc index 525ac5d758fb8..4294d2c3a2ede 100644 --- a/chrome/browser/ash/login/security_token_login_browsertest.cc +++ b/chrome/browser/ash/login/security_token_login_browsertest.cc @@ -44,10 +44,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/mixin_based_in_process_browser_test.h" +#include "chromeos/ash/components/dbus/cryptohome/key.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h" #include "chromeos/dbus/common/dbus_method_call_status.h" -#include "chromeos/dbus/cryptohome/key.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" #include "components/policy/core/browser/browser_policy_connector.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" diff --git a/chrome/browser/ash/login/shill_profile_loading_browsertest.cc b/chrome/browser/ash/login/shill_profile_loading_browsertest.cc index a542ae33ea62d..a373cd1db397c 100644 --- a/chrome/browser/ash/login/shill_profile_loading_browsertest.cc +++ b/chrome/browser/ash/login/shill_profile_loading_browsertest.cc @@ -26,9 +26,9 @@ #include "chrome/browser/ash/login/test/user_policy_mixin.h" #include "chrome/browser/ash/login/ui/user_adding_screen.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h" #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/shill/fake_shill_profile_client.h" #include "components/account_id/account_id.h" #include "components/policy/proto/chrome_settings.pb.h" diff --git a/chrome/browser/ash/login/test/cryptohome_mixin.cc b/chrome/browser/ash/login/test/cryptohome_mixin.cc index a7b7b19166412..54ce82b122a61 100644 --- a/chrome/browser/ash/login/test/cryptohome_mixin.cc +++ b/chrome/browser/ash/login/test/cryptohome_mixin.cc @@ -7,8 +7,8 @@ #include "ash/components/cryptohome/cryptohome_parameters.h" #include "chrome/browser/ash/login/test/login_manager_mixin.h" #include "chrome/test/base/mixin_based_in_process_browser_test.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" namespace ash { diff --git a/chrome/browser/ash/login/test/cryptohome_mixin.h b/chrome/browser/ash/login/test/cryptohome_mixin.h index a98d1c8680470..b4b8d8766c22f 100644 --- a/chrome/browser/ash/login/test/cryptohome_mixin.h +++ b/chrome/browser/ash/login/test/cryptohome_mixin.h @@ -9,7 +9,7 @@ #include "base/gtest_prod_util.h" #include "chrome/test/base/mixin_based_in_process_browser_test.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" namespace ash { diff --git a/chrome/browser/ash/login/test/user_policy_mixin.cc b/chrome/browser/ash/login/test/user_policy_mixin.cc index d6a07c2bd5834..3121847e2e3a8 100644 --- a/chrome/browser/ash/login/test/user_policy_mixin.cc +++ b/chrome/browser/ash/login/test/user_policy_mixin.cc @@ -15,11 +15,11 @@ #include "base/threading/thread_restrictions.h" #include "chrome/browser/ash/login/test/embedded_policy_test_server_mixin.h" #include "chrome/common/chrome_paths.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h" #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" #include "chromeos/dbus/constants/dbus_paths.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" namespace ash { diff --git a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc index 5d98c4b32adf6..985e2835f496e 100644 --- a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc +++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc @@ -83,13 +83,13 @@ #include "chrome/common/chrome_features.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/upstart/upstart_client.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" #include "chromeos/ash/components/network/proxy/proxy_config_service_impl.h" #include "chromeos/components/onc/certificate_scope.h" #include "chromeos/dbus/common/dbus_method_call_status.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "components/account_id/account_id.h" #include "components/crash/core/common/crash_key.h" diff --git a/chrome/browser/ash/policy/core/cached_policy_key_loader.h b/chrome/browser/ash/policy/core/cached_policy_key_loader.h index ec2d17c75b159..b25b72d656b97 100644 --- a/chrome/browser/ash/policy/core/cached_policy_key_loader.h +++ b/chrome/browser/ash/policy/core/cached_policy_key_loader.h @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "components/account_id/account_id.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_store_ash_unittest.cc b/chrome/browser/ash/policy/core/user_cloud_policy_store_ash_unittest.cc index bbfbe104e4c08..3d13e88bc880e 100644 --- a/chrome/browser/ash/policy/core/user_cloud_policy_store_ash_unittest.cc +++ b/chrome/browser/ash/policy/core/user_cloud_policy_store_ash_unittest.cc @@ -19,11 +19,11 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "chromeos/ash/components/dbus/cryptohome/account_identifier_operators.h" #include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h" #include "chromeos/ash/components/dbus/userdataauth/fake_cryptohome_misc_client.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" #include "chromeos/components/onc/onc_test_utils.h" -#include "chromeos/dbus/cryptohome/account_identifier_operators.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" #include "components/policy/core/common/cloud/mock_cloud_policy_store.h" #include "components/policy/core/common/cloud/test/policy_builder.h" diff --git a/chrome/browser/ash/policy/enrollment/enrollment_handler.cc b/chrome/browser/ash/policy/enrollment/enrollment_handler.cc index 1cd04c2bc5ab0..1fbb3c7f53716 100644 --- a/chrome/browser/ash/policy/enrollment/enrollment_handler.cc +++ b/chrome/browser/ash/policy/enrollment/enrollment_handler.cc @@ -36,8 +36,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chromeos/ash/components/dbus/authpolicy/authpolicy_client.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/upstart/upstart_client.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "components/policy/core/common/cloud/dm_auth.h" #include "components/policy/proto/chrome_device_policy.pb.h" diff --git a/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service.cc b/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service.cc index 7f66e2e44dd36..de57e563d3f80 100644 --- a/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service.cc +++ b/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service.cc @@ -9,9 +9,9 @@ #include "ash/components/attestation/attestation_flow_utils.h" #include "base/bind.h" +#include "chromeos/ash/components/dbus/attestation/attestation.pb.h" #include "chromeos/ash/components/dbus/attestation/attestation_client.h" #include "chromeos/ash/components/dbus/attestation/interface.pb.h" -#include "chromeos/dbus/attestation/attestation.pb.h" #include "chromeos/dbus/constants/attestation_constants.h" #include "components/policy/proto/device_management_backend.pb.h" @@ -41,7 +41,7 @@ void TpmEnrollmentKeySigningService::OnDataSigned( SigningCallback callback, const ::attestation::SignSimpleChallengeReply& reply) { enterprise_management::SignedData em_signed_data; - chromeos::attestation::SignedData att_signed_data; + ash::attestation::SignedData att_signed_data; const bool success = reply.status() == ::attestation::STATUS_SUCCESS && att_signed_data.ParseFromString(reply.challenge_response()); diff --git a/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service_unittest.cc b/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service_unittest.cc index 60937f7e248c1..97f63fc4e4c56 100644 --- a/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service_unittest.cc +++ b/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service_unittest.cc @@ -12,8 +12,8 @@ #include "base/callback_forward.h" #include "base/run_loop.h" #include "base/test/task_environment.h" +#include "chromeos/ash/components/dbus/attestation/attestation.pb.h" #include "chromeos/ash/components/dbus/attestation/attestation_client.h" -#include "chromeos/dbus/attestation/attestation.pb.h" #include "components/policy/proto/device_management_backend.pb.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.h b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.h index 916b97943efe2..9f5cc2241f525 100644 --- a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.h +++ b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.h @@ -10,7 +10,7 @@ #include "chrome/browser/ash/arc/session/arc_session_manager.h" #include "chrome/browser/ash/vm_starting_observer.h" #include "chromeos/ash/components/dbus/concierge/concierge_client.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "components/user_manager/user_manager.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc b/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc index 85d883a15d95b..3df6572b10cfb 100644 --- a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc +++ b/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc @@ -20,8 +20,8 @@ #include "chrome/browser/ui/browser_navigator_params.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/grit/generated_resources.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/policy/proto/chrome_device_policy.pb.h" #include "components/vector_icons/vector_icons.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc b/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc index 588c4abeb45e2..9f52cb787e459 100644 --- a/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc +++ b/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc @@ -10,8 +10,8 @@ #include "base/time/default_clock.h" #include "chrome/browser/ash/policy/core/device_cloud_policy_store_ash.h" #include "chrome/common/pref_names.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" #include "components/prefs/pref_service.h" diff --git a/chrome/browser/ash/policy/rsu/lookup_key_uploader.h b/chrome/browser/ash/policy/rsu/lookup_key_uploader.h index 9996d162aacc6..e16fb33c6a717 100644 --- a/chrome/browser/ash/policy/rsu/lookup_key_uploader.h +++ b/chrome/browser/ash/policy/rsu/lookup_key_uploader.h @@ -12,7 +12,7 @@ #include "base/time/clock.h" #include "base/time/time.h" #include "chrome/browser/ash/attestation/enrollment_certificate_uploader.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "components/policy/core/common/cloud/cloud_policy_store.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector.cc b/chrome/browser/ash/policy/status_collector/device_status_collector.cc index 1a9d26f11bdfc..bd1adb4b07188 100644 --- a/chrome/browser/ash/policy/status_collector/device_status_collector.cc +++ b/chrome/browser/ash/policy/status_collector/device_status_collector.cc @@ -68,6 +68,7 @@ #include "chrome/common/chrome_features.h" #include "chrome/common/pref_names.h" #include "chromeos/ash/components/dbus/attestation/attestation_client.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/hermes/hermes_euicc_client.h" #include "chromeos/ash/components/dbus/hermes/hermes_manager_client.h" #include "chromeos/ash/components/dbus/update_engine/update_engine_client.h" @@ -76,7 +77,6 @@ #include "chromeos/ash/components/network/network_state.h" #include "chromeos/ash/components/network/network_state_handler.h" #include "chromeos/ash/services/cros_healthd/public/mojom/cros_healthd_probe.mojom.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/power_manager/idle.pb.h" #include "chromeos/dbus/tpm_manager/tpm_manager.pb.h" #include "chromeos/dbus/tpm_manager/tpm_manager_client.h" diff --git a/chrome/browser/ash/profiles/profile_helper.cc b/chrome/browser/ash/profiles/profile_helper.cc index e2e322edbefd5..ecd883ec61a9b 100644 --- a/chrome/browser/ash/profiles/profile_helper.cc +++ b/chrome/browser/ash/profiles/profile_helper.cc @@ -35,7 +35,7 @@ namespace ash { namespace { -// As defined in /chromeos/dbus/cryptohome/cryptohome_client.cc. +// As defined in /chromeos/ash/components/dbus/cryptohome/cryptohome_client.cc. static const char kUserIdHashSuffix[] = "-hash"; class UsernameHashMatcher { diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 04ee7ae75c533..f791bfe04b359 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -264,6 +264,9 @@ source_set("chromeos") { "//chromeos/ash/components/dbus/concierge", "//chromeos/ash/components/dbus/cros_disks", "//chromeos/ash/components/dbus/cros_healthd", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:attestation_proto", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/cups_proxy", "//chromeos/ash/components/dbus/debug_daemon", "//chromeos/ash/components/dbus/easy_unlock", @@ -341,9 +344,6 @@ source_set("chromeos") { "//chromeos/crosapi/mojom", "//chromeos/dbus", "//chromeos/dbus/constants", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:attestation_proto", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/dlcservice", "//chromeos/dbus/dlcservice:dlcservice_proto", "//chromeos/dbus/dlp", @@ -2656,6 +2656,8 @@ static_library("test_support") { "//chromeos/ash/components/dbus/cicerone", "//chromeos/ash/components/dbus/concierge", "//chromeos/ash/components/dbus/cros_disks", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/lorgnette_manager", "//chromeos/ash/components/dbus/lorgnette_manager:lorgnette_proto", "//chromeos/ash/components/dbus/seneschal", @@ -2663,8 +2665,6 @@ static_library("test_support") { "//chromeos/ash/components/dbus/userdataauth:userdataauth", "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", "//chromeos/dbus:test_support", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/dlcservice", "//chromeos/printing", "//chromeos/system", @@ -3634,6 +3634,8 @@ source_set("unit_tests") { "//chromeos/ash/components/dbus/attestation:attestation_proto", "//chromeos/ash/components/dbus/authpolicy", "//chromeos/ash/components/dbus/cros_disks", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:attestation_proto", "//chromeos/ash/components/dbus/gnubby", "//chromeos/ash/components/dbus/lorgnette_manager:lorgnette_proto", "//chromeos/ash/components/dbus/oobe_config", @@ -3654,8 +3656,6 @@ source_set("unit_tests") { "//chromeos/components/sensors:test_support", "//chromeos/components/sync_wifi:test_support", "//chromeos/dbus:test_support", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:attestation_proto", "//chromeos/dbus/dlcservice", "//chromeos/dbus/dlp", "//chromeos/dbus/missive", diff --git a/chrome/browser/chromeos/extensions/login_screen/login/login_apitest.cc b/chrome/browser/chromeos/extensions/login_screen/login/login_apitest.cc index fef0a14732e2d..a40d2762adbf6 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/login_apitest.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/login_apitest.cc @@ -24,9 +24,9 @@ #include "chrome/browser/chromeos/extensions/login_screen/login_screen_apitest_base.h" #include "chrome/browser/policy/extension_force_install_mixin.h" #include "chrome/common/pref_names.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h" #include "chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" #include "components/policy/core/common/cloud/test/policy_builder.h" #include "components/policy/core/common/policy_service.h" diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index 3d0b479231fb8..c87c4e06a1f12 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -1166,13 +1166,13 @@ static_library("extensions") { "//chromeos/ash/components/dbus/cicerone:cicerone", "//chromeos/ash/components/dbus/cicerone:cicerone_proto", "//chromeos/ash/components/dbus/cros_disks", + "//chromeos/ash/components/dbus/cryptohome", "//chromeos/ash/components/dbus/image_burner", "//chromeos/ash/components/dbus/update_engine", "//chromeos/ash/components/network", "//chromeos/ash/services/assistant/public/cpp", "//chromeos/components/remote_apps/mojom", "//chromeos/dbus", - "//chromeos/dbus/cryptohome", "//chromeos/language/language_packs", "//chromeos/language/public/mojom", "//chromeos/login/login_state", diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index fe977b43ff3c9..55e7b2c26da53 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -3151,6 +3151,8 @@ static_library("ui") { "//chrome/services/file_util/public/cpp", "//chromeos/ash/components/assistant:buildflags", "//chromeos/ash/components/dbus/audio", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/hermes", "//chromeos/ash/components/dbus/human_presence", "//chromeos/ash/components/dbus/kerberos:kerberos_proto", @@ -3186,8 +3188,6 @@ static_library("ui") { "//chromeos/crosapi/cpp", "//chromeos/crosapi/cpp:crosapi_constants", "//chromeos/dbus", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/tpm_manager", "//chromeos/dbus/tpm_manager:tpm_manager_proto", "//chromeos/login/login_state", diff --git a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc index b04563220f898..501f4f2f3afa3 100644 --- a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc +++ b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/logging.h" #include "base/values.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/tpm_manager/tpm_manager_client.h" #include "content/public/browser/browser_task_traits.h" diff --git a/chrome/browser/ui/webui/settings/ash/calculator/size_calculator.h b/chrome/browser/ui/webui/settings/ash/calculator/size_calculator.h index 7c148217ae3e9..f7afa7f6d85fc 100644 --- a/chrome/browser/ui/webui/settings/ash/calculator/size_calculator.h +++ b/chrome/browser/ui/webui/settings/ash/calculator/size_calculator.h @@ -18,8 +18,8 @@ #include "base/observer_list_types.h" #include "chrome/browser/ash/crostini/crostini_manager.h" #include "chrome/browser/browsing_data/site_data_size_collector.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "components/user_manager/user.h" class Profile; diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index c31577cccb0d8..9b233cbc8f232 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -4188,6 +4188,8 @@ if (!is_android) { "//chromeos/ash/components/dbus/cicerone", "//chromeos/ash/components/dbus/concierge", "//chromeos/ash/components/dbus/cros_disks", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/image_burner", "//chromeos/ash/components/dbus/rmad:rmad", "//chromeos/ash/components/dbus/seneschal", @@ -4208,8 +4210,6 @@ if (!is_android) { "//chromeos/components/quick_answers/public/cpp:cpp", "//chromeos/components/remote_apps/mojom:mojom", "//chromeos/dbus:test_support", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/dlp", "//chromeos/dbus/missive:test_support", "//chromeos/login/login_state:test_support", diff --git a/chromeos/ash/components/dbus/BUILD.gn b/chromeos/ash/components/dbus/BUILD.gn index 54f59d5c90f52..f5e56bdf495b7 100644 --- a/chromeos/ash/components/dbus/BUILD.gn +++ b/chromeos/ash/components/dbus/BUILD.gn @@ -20,6 +20,8 @@ source_set("unit_tests") { "//chromeos/ash/components/dbus/biod:test_support", "//chromeos/ash/components/dbus/cec_service:unit_tests", "//chromeos/ash/components/dbus/cros_disks:unit_tests", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:attestation_proto", "//chromeos/ash/components/dbus/easy_unlock:unit_tests", "//chromeos/ash/components/dbus/fwupd:test_support", "//chromeos/ash/components/dbus/gnubby:unit_tests", diff --git a/chromeos/ash/components/dbus/authpolicy/BUILD.gn b/chromeos/ash/components/dbus/authpolicy/BUILD.gn index 32f4e3649410f..8154713b110b4 100644 --- a/chromeos/ash/components/dbus/authpolicy/BUILD.gn +++ b/chromeos/ash/components/dbus/authpolicy/BUILD.gn @@ -21,8 +21,8 @@ component("authpolicy") { "//dbus", # For FakeAuthPolicyClient + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/session_manager", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//components/policy:cloud_policy_proto_generated_compile", ] diff --git a/chromeos/ash/components/dbus/authpolicy/fake_authpolicy_client.cc b/chromeos/ash/components/dbus/authpolicy/fake_authpolicy_client.cc index 64b3361c677f7..453b3d3b88c69 100644 --- a/chromeos/ash/components/dbus/authpolicy/fake_authpolicy_client.cc +++ b/chromeos/ash/components/dbus/authpolicy/fake_authpolicy_client.cc @@ -15,9 +15,9 @@ #include "base/strings/string_split.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h" #include "chromeos/ash/components/install_attributes/install_attributes.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" #include "components/policy/proto/cloud_policy.pb.h" #include "dbus/message.h" diff --git a/chromeos/dbus/cryptohome/BUILD.gn b/chromeos/ash/components/dbus/cryptohome/BUILD.gn similarity index 74% rename from chromeos/dbus/cryptohome/BUILD.gn rename to chromeos/ash/components/dbus/cryptohome/BUILD.gn index fd69f5aea70d8..e9697ef49c715 100644 --- a/chromeos/dbus/cryptohome/BUILD.gn +++ b/chromeos/ash/components/dbus/cryptohome/BUILD.gn @@ -2,13 +2,14 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/chromeos/ui_mode.gni") import("//third_party/protobuf/proto_library.gni") -assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos") +assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //chromeos/ash") component("cryptohome") { # Avoid conflict with //chromoes/cryptohome - output_name = "chromeos_dbus_cryptohome" + output_name = "ash_dbus_cryptohome" defines = [ "IS_CRYPTOHOME_CLIENT_IMPL" ] @@ -30,7 +31,7 @@ component("cryptohome") { proto_library("attestation_proto") { sources = [ "attestation.proto" ] - proto_out_dir = "chromeos/dbus/attestation" + proto_out_dir = "chromeos/ash/components/dbus/attestation" } proto_library("cryptohome_proto") { @@ -39,5 +40,5 @@ proto_library("cryptohome_proto") { "//third_party/cros_system_api/dbus/cryptohome/rpc.proto", ] - proto_out_dir = "chromeos/dbus/cryptohome" + proto_out_dir = "chromeos/ash/components/dbus/cryptohome" } diff --git a/chromeos/dbus/cryptohome/OWNERS b/chromeos/ash/components/dbus/cryptohome/OWNERS similarity index 100% rename from chromeos/dbus/cryptohome/OWNERS rename to chromeos/ash/components/dbus/cryptohome/OWNERS diff --git a/chromeos/dbus/cryptohome/account_identifier_operators.cc b/chromeos/ash/components/dbus/cryptohome/account_identifier_operators.cc similarity index 84% rename from chromeos/dbus/cryptohome/account_identifier_operators.cc rename to chromeos/ash/components/dbus/cryptohome/account_identifier_operators.cc index cae7fe89a55f0..4a5863583dea6 100644 --- a/chromeos/dbus/cryptohome/account_identifier_operators.cc +++ b/chromeos/ash/components/dbus/cryptohome/account_identifier_operators.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 "chromeos/dbus/cryptohome/account_identifier_operators.h" +#include "chromeos/ash/components/dbus/cryptohome/account_identifier_operators.h" namespace cryptohome { diff --git a/chromeos/dbus/cryptohome/account_identifier_operators.h b/chromeos/ash/components/dbus/cryptohome/account_identifier_operators.h similarity index 65% rename from chromeos/dbus/cryptohome/account_identifier_operators.h rename to chromeos/ash/components/dbus/cryptohome/account_identifier_operators.h index c00f8055b4621..d48639de0cb58 100644 --- a/chromeos/dbus/cryptohome/account_identifier_operators.h +++ b/chromeos/ash/components/dbus/cryptohome/account_identifier_operators.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_DBUS_CRYPTOHOME_ACCOUNT_IDENTIFIER_OPERATORS_H_ -#define CHROMEOS_DBUS_CRYPTOHOME_ACCOUNT_IDENTIFIER_OPERATORS_H_ +#ifndef CHROMEOS_ASH_COMPONENTS_DBUS_CRYPTOHOME_ACCOUNT_IDENTIFIER_OPERATORS_H_ +#define CHROMEOS_ASH_COMPONENTS_DBUS_CRYPTOHOME_ACCOUNT_IDENTIFIER_OPERATORS_H_ #include "base/component_export.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" namespace cryptohome { @@ -20,4 +20,4 @@ bool operator==(const AccountIdentifier& l, const AccountIdentifier& r); } // namespace cryptohome -#endif // CHROMEOS_DBUS_CRYPTOHOME_ACCOUNT_IDENTIFIER_OPERATORS_H_ +#endif // CHROMEOS_ASH_COMPONENTS_DBUS_CRYPTOHOME_ACCOUNT_IDENTIFIER_OPERATORS_H_ diff --git a/chromeos/dbus/cryptohome/attestation.proto b/chromeos/ash/components/dbus/cryptohome/attestation.proto similarity index 93% rename from chromeos/dbus/cryptohome/attestation.proto rename to chromeos/ash/components/dbus/cryptohome/attestation.proto index 7377a4d4b1268..9f4fb63791745 100644 --- a/chromeos/dbus/cryptohome/attestation.proto +++ b/chromeos/ash/components/dbus/cryptohome/attestation.proto @@ -6,7 +6,7 @@ syntax = "proto2"; option optimize_for = LITE_RUNTIME; -package chromeos.attestation; +package ash.attestation; // The message used by the attestation service for challenge response. message SignedData { diff --git a/chromeos/ash/components/dbus/debug_daemon/BUILD.gn b/chromeos/ash/components/dbus/debug_daemon/BUILD.gn index 7d1e7b13c35b2..b7fd4467900f8 100644 --- a/chromeos/ash/components/dbus/debug_daemon/BUILD.gn +++ b/chromeos/ash/components/dbus/debug_daemon/BUILD.gn @@ -11,9 +11,9 @@ component("debug_daemon") { deps = [ "//base", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/common", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//dbus", ] diff --git a/chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.cc b/chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.cc index 6b1955acbf89f..effdfe022d25e 100644 --- a/chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.cc +++ b/chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.cc @@ -30,9 +30,9 @@ #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_config.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.h" #include "chromeos/dbus/common/pipe_reader.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_path.h" diff --git a/chromeos/ash/components/dbus/gnubby/BUILD.gn b/chromeos/ash/components/dbus/gnubby/BUILD.gn index b9d9c7437c377..a5ea72e001858 100644 --- a/chromeos/ash/components/dbus/gnubby/BUILD.gn +++ b/chromeos/ash/components/dbus/gnubby/BUILD.gn @@ -28,7 +28,7 @@ source_set("unit_tests") { ":gnubby", "//base", "//base/test:test_support", - "//chromeos/dbus/cryptohome:attestation_proto", + "//chromeos/ash/components/dbus/cryptohome:attestation_proto", "//dbus", "//testing/gtest", ] diff --git a/chromeos/ash/components/dbus/gnubby/fake_gnubby_client_unittest.cc b/chromeos/ash/components/dbus/gnubby/fake_gnubby_client_unittest.cc index 6b935d08e85b8..7de33f4c992ee 100644 --- a/chromeos/ash/components/dbus/gnubby/fake_gnubby_client_unittest.cc +++ b/chromeos/ash/components/dbus/gnubby/fake_gnubby_client_unittest.cc @@ -6,8 +6,8 @@ #include "base/scoped_observation.h" #include "base/test/task_environment.h" +#include "chromeos/ash/components/dbus/attestation/attestation.pb.h" #include "chromeos/ash/components/dbus/gnubby/gnubby_client.h" -#include "chromeos/dbus/attestation/attestation.pb.h" #include "testing/gtest/include/gtest/gtest.h" namespace ash { diff --git a/chromeos/ash/components/dbus/session_manager/BUILD.gn b/chromeos/ash/components/dbus/session_manager/BUILD.gn index ffc1ad13d8559..128f69b406b02 100644 --- a/chromeos/ash/components/dbus/session_manager/BUILD.gn +++ b/chromeos/ash/components/dbus/session_manager/BUILD.gn @@ -14,11 +14,11 @@ component("session_manager") { deps = [ "//base", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/userdataauth", "//chromeos/dbus/common", "//chromeos/dbus/constants", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//components/policy/proto", "//crypto", "//dbus", diff --git a/chromeos/ash/components/dbus/session_manager/fake_session_manager_client.cc b/chromeos/ash/components/dbus/session_manager/fake_session_manager_client.cc index 5dc975dcd2716..8f67d40d39b01 100644 --- a/chromeos/ash/components/dbus/session_manager/fake_session_manager_client.cc +++ b/chromeos/ash/components/dbus/session_manager/fake_session_manager_client.cc @@ -24,10 +24,10 @@ #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/values.h" +#include "chromeos/ash/components/dbus/cryptohome/account_identifier_operators.h" #include "chromeos/ash/components/dbus/login_manager/policy_descriptor.pb.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" #include "chromeos/dbus/constants/dbus_paths.h" -#include "chromeos/dbus/cryptohome/account_identifier_operators.h" #include "components/policy/proto/device_management_backend.pb.h" #include "crypto/sha2.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/chromeos/ash/components/dbus/session_manager/session_manager_client.cc b/chromeos/ash/components/dbus/session_manager/session_manager_client.cc index cd3c1715e00ca..bf1367aa92840 100644 --- a/chromeos/ash/components/dbus/session_manager/session_manager_client.cc +++ b/chromeos/ash/components/dbus/session_manager/session_manager_client.cc @@ -28,12 +28,12 @@ #include "base/strings/stringprintf.h" #include "base/threading/thread_task_runner_handle.h" #include "base/unguessable_token.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/login_manager/arc.pb.h" #include "chromeos/ash/components/dbus/login_manager/login_screen_storage.pb.h" #include "chromeos/ash/components/dbus/login_manager/policy_descriptor.pb.h" #include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h" #include "chromeos/dbus/common/blocking_method_caller.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/policy/proto/device_management_backend.pb.h" #include "dbus/bus.h" #include "dbus/message.h" diff --git a/chromeos/ash/components/dbus/userdataauth/BUILD.gn b/chromeos/ash/components/dbus/userdataauth/BUILD.gn index 7f44bc4dcce64..df238fd02a9bd 100644 --- a/chromeos/ash/components/dbus/userdataauth/BUILD.gn +++ b/chromeos/ash/components/dbus/userdataauth/BUILD.gn @@ -15,9 +15,9 @@ component("userdataauth") { deps = [ ":userdataauth_proto", "//base", + "//chromeos/ash/components/dbus/cryptohome", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/common", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//components/policy/proto", "//dbus", ] @@ -64,7 +64,7 @@ static_library("test_support") { } proto_library("userdataauth_proto") { - deps = [ "//chromeos/dbus/cryptohome:cryptohome_proto" ] + deps = [ "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto" ] sources = [ "//third_party/cros_system_api/dbus/cryptohome/UserDataAuth.proto", @@ -72,5 +72,5 @@ proto_library("userdataauth_proto") { "//third_party/cros_system_api/dbus/cryptohome/fido.proto", ] - proto_out_dir = "chromeos/dbus/cryptohome" + proto_out_dir = "chromeos/ash/components/dbus/cryptohome" } diff --git a/chromeos/ash/components/dbus/userdataauth/arc_quota_client.h b/chromeos/ash/components/dbus/userdataauth/arc_quota_client.h index 2890998c5e38d..169069489055f 100644 --- a/chromeos/ash/components/dbus/userdataauth/arc_quota_client.h +++ b/chromeos/ash/components/dbus/userdataauth/arc_quota_client.h @@ -8,9 +8,9 @@ #include "base/callback.h" #include "base/component_export.h" #include "base/observer_list_types.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/common/dbus_method_call_status.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" namespace dbus { class Bus; diff --git a/chromeos/ash/components/dbus/userdataauth/arc_quota_client_unittest.cc b/chromeos/ash/components/dbus/userdataauth/arc_quota_client_unittest.cc index 215c04551f1ce..b2095d798c244 100644 --- a/chromeos/ash/components/dbus/userdataauth/arc_quota_client_unittest.cc +++ b/chromeos/ash/components/dbus/userdataauth/arc_quota_client_unittest.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/test/task_environment.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "dbus/mock_bus.h" #include "dbus/mock_object_proxy.h" #include "dbus/object_path.h" diff --git a/chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h b/chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h index 31e5ade18b44f..41e58118be67b 100644 --- a/chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h +++ b/chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h @@ -8,9 +8,9 @@ #include "base/callback.h" #include "base/component_export.h" #include "base/observer_list_types.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/common/dbus_method_call_status.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace dbus { diff --git a/chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client_unittest.cc b/chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client_unittest.cc index 60650b7f49256..8f2cbea1d5b4b 100644 --- a/chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client_unittest.cc +++ b/chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client_unittest.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/test/task_environment.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "dbus/mock_bus.h" #include "dbus/mock_object_proxy.h" #include "dbus/object_path.h" diff --git a/chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client.h b/chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client.h index b4b1ef4c139dc..1a41874e8659f 100644 --- a/chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client.h +++ b/chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client.h @@ -8,9 +8,9 @@ #include "base/callback.h" #include "base/component_export.h" #include "base/observer_list_types.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/common/dbus_method_call_status.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" namespace dbus { class Bus; diff --git a/chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client_unittest.cc b/chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client_unittest.cc index 08ece422b8a1e..2689c47028b10 100644 --- a/chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client_unittest.cc +++ b/chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client_unittest.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/test/task_environment.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "dbus/mock_bus.h" #include "dbus/mock_object_proxy.h" #include "dbus/object_path.h" diff --git a/chromeos/ash/components/dbus/userdataauth/fake_arc_quota_client.h b/chromeos/ash/components/dbus/userdataauth/fake_arc_quota_client.h index 71d7a4ba8a33a..eec798d6b68d3 100644 --- a/chromeos/ash/components/dbus/userdataauth/fake_arc_quota_client.h +++ b/chromeos/ash/components/dbus/userdataauth/fake_arc_quota_client.h @@ -8,7 +8,7 @@ #include "chromeos/ash/components/dbus/userdataauth/arc_quota_client.h" #include "base/component_export.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" namespace ash { diff --git a/chromeos/ash/components/dbus/userdataauth/fake_cryptohome_misc_client.h b/chromeos/ash/components/dbus/userdataauth/fake_cryptohome_misc_client.h index d25464bd0433e..c1e25060147bd 100644 --- a/chromeos/ash/components/dbus/userdataauth/fake_cryptohome_misc_client.h +++ b/chromeos/ash/components/dbus/userdataauth/fake_cryptohome_misc_client.h @@ -8,7 +8,7 @@ #include "chromeos/ash/components/dbus/userdataauth/cryptohome_misc_client.h" #include "base/component_export.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" namespace ash { diff --git a/chromeos/ash/components/dbus/userdataauth/fake_cryptohome_pkcs11_client.h b/chromeos/ash/components/dbus/userdataauth/fake_cryptohome_pkcs11_client.h index 1d035ae5d850d..8cbb5a28f5a45 100644 --- a/chromeos/ash/components/dbus/userdataauth/fake_cryptohome_pkcs11_client.h +++ b/chromeos/ash/components/dbus/userdataauth/fake_cryptohome_pkcs11_client.h @@ -8,7 +8,7 @@ #include "chromeos/ash/components/dbus/userdataauth/cryptohome_pkcs11_client.h" #include "base/component_export.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" namespace ash { diff --git a/chromeos/ash/components/dbus/userdataauth/fake_install_attributes_client.cc b/chromeos/ash/components/dbus/userdataauth/fake_install_attributes_client.cc index 0a0da91040308..54544fa410b6d 100644 --- a/chromeos/ash/components/dbus/userdataauth/fake_install_attributes_client.cc +++ b/chromeos/ash/components/dbus/userdataauth/fake_install_attributes_client.cc @@ -12,8 +12,8 @@ #include "base/path_service.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/constants/dbus_paths.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/policy/proto/install_attributes.pb.h" namespace ash { diff --git a/chromeos/ash/components/dbus/userdataauth/fake_install_attributes_client.h b/chromeos/ash/components/dbus/userdataauth/fake_install_attributes_client.h index efe1076b44c56..df954370973be 100644 --- a/chromeos/ash/components/dbus/userdataauth/fake_install_attributes_client.h +++ b/chromeos/ash/components/dbus/userdataauth/fake_install_attributes_client.h @@ -8,7 +8,7 @@ #include "chromeos/ash/components/dbus/userdataauth/install_attributes_client.h" #include "base/component_export.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" namespace ash { diff --git a/chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.cc b/chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.cc index 08567c6be51b6..4e5cdbe78e2d1 100644 --- a/chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.cc +++ b/chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.cc @@ -19,8 +19,8 @@ #include "base/strings/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "third_party/abseil-cpp/absl/types/variant.h" namespace ash { diff --git a/chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h b/chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h index 4240d4e10d119..214ccc7870948 100644 --- a/chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h +++ b/chromeos/ash/components/dbus/userdataauth/fake_userdataauth_client.h @@ -6,16 +6,16 @@ #define CHROMEOS_ASH_COMPONENTS_DBUS_USERDATAAUTH_FAKE_USERDATAAUTH_CLIENT_H_ #include "base/memory/raw_ptr.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "base/component_export.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" #include "base/observer_list.h" #include "base/timer/timer.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/account_identifier_operators.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/account_identifier_operators.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace ash { diff --git a/chromeos/ash/components/dbus/userdataauth/install_attributes_client.h b/chromeos/ash/components/dbus/userdataauth/install_attributes_client.h index 72927e2fe4c33..7bb95d5da1032 100644 --- a/chromeos/ash/components/dbus/userdataauth/install_attributes_client.h +++ b/chromeos/ash/components/dbus/userdataauth/install_attributes_client.h @@ -8,9 +8,9 @@ #include "base/callback.h" #include "base/component_export.h" #include "base/observer_list_types.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/common/dbus_method_call_status.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace dbus { diff --git a/chromeos/ash/components/dbus/userdataauth/install_attributes_client_unittest.cc b/chromeos/ash/components/dbus/userdataauth/install_attributes_client_unittest.cc index 62bc4ad93c37a..6d559b288696e 100644 --- a/chromeos/ash/components/dbus/userdataauth/install_attributes_client_unittest.cc +++ b/chromeos/ash/components/dbus/userdataauth/install_attributes_client_unittest.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/test/task_environment.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "dbus/mock_bus.h" #include "dbus/mock_object_proxy.h" #include "dbus/object_path.h" diff --git a/chromeos/ash/components/dbus/userdataauth/userdataauth_client.h b/chromeos/ash/components/dbus/userdataauth/userdataauth_client.h index 9d1512e3d143e..1998562e41e09 100644 --- a/chromeos/ash/components/dbus/userdataauth/userdataauth_client.h +++ b/chromeos/ash/components/dbus/userdataauth/userdataauth_client.h @@ -8,9 +8,9 @@ #include "base/callback.h" #include "base/component_export.h" #include "base/observer_list_types.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/common/dbus_method_call_status.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" namespace dbus { class Bus; diff --git a/chromeos/ash/components/dbus/userdataauth/userdataauth_client_unittest.cc b/chromeos/ash/components/dbus/userdataauth/userdataauth_client_unittest.cc index 0cef48b3b792b..bc2b7304ea6fe 100644 --- a/chromeos/ash/components/dbus/userdataauth/userdataauth_client_unittest.cc +++ b/chromeos/ash/components/dbus/userdataauth/userdataauth_client_unittest.cc @@ -8,7 +8,7 @@ #include #include "base/test/task_environment.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" #include "dbus/mock_bus.h" #include "dbus/mock_object_proxy.h" #include "dbus/object_path.h" diff --git a/chromeos/ash/components/install_attributes/BUILD.gn b/chromeos/ash/components/install_attributes/BUILD.gn index a590e2e8b8390..5ad4cdcca770c 100644 --- a/chromeos/ash/components/install_attributes/BUILD.gn +++ b/chromeos/ash/components/install_attributes/BUILD.gn @@ -16,9 +16,9 @@ component("install_attributes") { "//third_party/abseil-cpp:absl", ] deps = [ + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", "//chromeos/dbus/constants", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/tpm_manager", "//components/policy/proto:proto", "//google_apis:google_apis", @@ -48,9 +48,9 @@ source_set("unit_tests") { ":install_attributes", "//base", "//base/test:test_support", + "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", "//chromeos/ash/components/dbus/userdataauth", "//chromeos/dbus/constants", - "//chromeos/dbus/cryptohome:cryptohome_proto", "//chromeos/dbus/tpm_manager", "//components/policy/proto:proto", "//google_apis:google_apis", diff --git a/chromeos/ash/components/install_attributes/DEPS b/chromeos/ash/components/install_attributes/DEPS index 76f33c3d889b4..849cf4113e565 100644 --- a/chromeos/ash/components/install_attributes/DEPS +++ b/chromeos/ash/components/install_attributes/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+chromeos/ash/components/dbus/cryptohome", "+chromeos/ash/components/dbus/userdataauth", "+components/policy/core/common/cloud/cloud_policy_constants.h", ] diff --git a/chromeos/ash/components/install_attributes/install_attributes.cc b/chromeos/ash/components/install_attributes/install_attributes.cc index e09b7f44b8f82..0bf2b0b1b27be 100644 --- a/chromeos/ash/components/install_attributes/install_attributes.cc +++ b/chromeos/ash/components/install_attributes/install_attributes.cc @@ -20,10 +20,10 @@ #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" +#include "chromeos/ash/components/dbus/cryptohome/UserDataAuth.pb.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/install_attributes_util.h" #include "chromeos/dbus/constants/dbus_paths.h" -#include "chromeos/dbus/cryptohome/UserDataAuth.pb.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/tpm_manager/tpm_manager.pb.h" #include "chromeos/dbus/tpm_manager/tpm_manager_client.h" #include "components/policy/proto/install_attributes.pb.h" diff --git a/chromeos/ash/components/install_attributes/install_attributes_unittest.cc b/chromeos/ash/components/install_attributes/install_attributes_unittest.cc index 93b268dc035a5..7c12ddb5d8ce8 100644 --- a/chromeos/ash/components/install_attributes/install_attributes_unittest.cc +++ b/chromeos/ash/components/install_attributes/install_attributes_unittest.cc @@ -14,9 +14,9 @@ #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" +#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h" #include "chromeos/ash/components/dbus/userdataauth/install_attributes_util.h" #include "chromeos/dbus/constants/dbus_paths.h" -#include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/tpm_manager/tpm_manager_client.h" #include "components/policy/proto/install_attributes.pb.h" #include "google_apis/gaia/gaia_auth_util.h" diff --git a/chromeos/dbus/BUILD.gn b/chromeos/dbus/BUILD.gn index d273fd009c6d9..dda4176190ecb 100644 --- a/chromeos/dbus/BUILD.gn +++ b/chromeos/dbus/BUILD.gn @@ -47,8 +47,6 @@ source_set("unit_tests") { ":test_support", "//base", "//base/test:test_support", - "//chromeos/dbus/cryptohome", - "//chromeos/dbus/cryptohome:attestation_proto", "//chromeos/dbus/dlcservice:unit_tests", "//chromeos/dbus/power:power_manager_proto", "//chromeos/dbus/power:test_support",