diff --git a/BUILD.gn b/BUILD.gn index a4cf1948cc052..2a1fb96a020f1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -468,12 +468,12 @@ group("gn_all") { if (is_chromeos_ash) { deps += [ "//ash:ash_unittests", + "//ash/components/proximity_auth:proximity_auth_unittests", "//ash/keyboard/ui:keyboard_unittests", "//ash/webui:ash_webui_unittests", "//chrome/browser/metrics/perf:profile_provider_unittest", "//chrome/test:usage_time_limit_unittests", "//chromeos/components:chromeos_components_unittests", - "//chromeos/components/proximity_auth:proximity_auth_unittests", "//components/exo/wayland:wayland_client_compatibility_tests", "//components/session_manager/core", "//third_party/shell-encryption:shell_encryption_unittests", diff --git a/WATCHLISTS b/WATCHLISTS index b07f1106dd0c1..db0516fe4d8ce 100644 --- a/WATCHLISTS +++ b/WATCHLISTS @@ -1331,7 +1331,8 @@ 'filepath': 'tools/perf/core/minidump_unittest.py', }, 'multidevice': { - 'filepath': 'ash/multi_device_setup/'\ + 'filepath': 'ash/components/proximity_auth/'\ + '|ash/multi_device_setup/'\ '|chrome/browser/ash/cryptauth/'\ '|chrome/browser/ash/device_sync/'\ '|chrome/browser/ash/multidevice_setup/'\ @@ -1342,7 +1343,6 @@ '|chrome/browser/ui/webui/settings/chromeos/multidevice'\ '|chrome/test/data/webui/multidevice_setup/'\ '|chromeos/components/multidevice/'\ - '|chromeos/components/proximity_auth/'\ '|chromeos/resources/multidevice_resources.grdp'\ '|chromeos/services/device_sync/'\ '|chromeos/services/multidevice_setup/'\ @@ -1714,12 +1714,12 @@ 'content/browser/browsing_instance', }, 'smartlock': { - 'filepath': 'ash/public/cpp/smartlock*'\ + 'filepath': 'ash/components/proximity_auth/'\ + '|ash/public/cpp/smartlock*'\ '|chrome/browser/ash/login/easy_unlock/'\ '|chrome/browser/resources/chromeos/quick_unlock/'\ '|chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock*'\ '|chrome/test/data/webui/settings/chromeos/multidevice_smartlock*'\ - '|chromeos/components/proximity_auth/'\ '|chromeos/dbus/easy_unlock/', }, 'smb': { diff --git a/ash/DEPS b/ash/DEPS index 7e24f9b90dda2..e621074a8240f 100644 --- a/ash/DEPS +++ b/ash/DEPS @@ -57,7 +57,6 @@ include_rules = [ # //ash can use chromeos components that sit below it in the dependency tree. "+chromeos/components/feature_usage", "+chromeos/components/multidevice", - "+chromeos/components/proximity_auth/public", "+chromeos/components/quick_answers", "+chromeos/components/sensors", # crosapi is an API to support lacros. diff --git a/ash/components/BUILD.gn b/ash/components/BUILD.gn index 844d10d744ae8..60201e2f12f33 100644 --- a/ash/components/BUILD.gn +++ b/ash/components/BUILD.gn @@ -23,6 +23,7 @@ source_set("unit_tests") { "//ash/components/phonehub:unit_tests", "//ash/components/policy:unit_tests", "//ash/components/power:unit_tests", + "//ash/components/proximity_auth:unit_tests", "//ash/components/security_token_pin:unit_tests", "//ash/components/settings:unit_tests", "//ash/components/smbfs:unit_tests", diff --git a/chromeos/components/proximity_auth/BUILD.gn b/ash/components/proximity_auth/BUILD.gn similarity index 96% rename from chromeos/components/proximity_auth/BUILD.gn rename to ash/components/proximity_auth/BUILD.gn index 54c3369ed4edb..915c738ee19af 100644 --- a/chromeos/components/proximity_auth/BUILD.gn +++ b/ash/components/proximity_auth/BUILD.gn @@ -2,9 +2,10 @@ # 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("//testing/test.gni") -assert(is_chromeos, "ProximityAuth is Chrome OS only") +assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") static_library("proximity_auth") { sources = [ @@ -45,12 +46,12 @@ static_library("proximity_auth") { ] deps = [ + "//ash/components/proximity_auth/public/mojom", "//ash/constants", "//ash/public/cpp", "//base", "//chromeos/components/multidevice", "//chromeos/components/multidevice/logging", - "//chromeos/components/proximity_auth/public/mojom", "//chromeos/dbus/power", "//chromeos/dbus/session_manager", "//chromeos/services/multidevice_setup/public/cpp", diff --git a/ash/components/proximity_auth/DEPS b/ash/components/proximity_auth/DEPS new file mode 100644 index 0000000000000..4c8171f627803 --- /dev/null +++ b/ash/components/proximity_auth/DEPS @@ -0,0 +1,5 @@ +include_rules = [ + "+chromeos/services/device_sync/proto", + "+chromeos/services/secure_channel", + "+components/sync_preferences/testing_pref_service_syncable.h", +] diff --git a/chromeos/components/proximity_auth/DIR_METADATA b/ash/components/proximity_auth/DIR_METADATA similarity index 100% rename from chromeos/components/proximity_auth/DIR_METADATA rename to ash/components/proximity_auth/DIR_METADATA diff --git a/chromeos/components/proximity_auth/OWNERS b/ash/components/proximity_auth/OWNERS similarity index 100% rename from chromeos/components/proximity_auth/OWNERS rename to ash/components/proximity_auth/OWNERS diff --git a/chromeos/components/proximity_auth/fake_lock_handler.cc b/ash/components/proximity_auth/fake_lock_handler.cc similarity index 96% rename from chromeos/components/proximity_auth/fake_lock_handler.cc rename to ash/components/proximity_auth/fake_lock_handler.cc index 00a7a5aef69d2..4eb1677d3bb6b 100644 --- a/chromeos/components/proximity_auth/fake_lock_handler.cc +++ b/ash/components/proximity_auth/fake_lock_handler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/fake_lock_handler.h" +#include "ash/components/proximity_auth/fake_lock_handler.h" namespace proximity_auth { diff --git a/chromeos/components/proximity_auth/fake_lock_handler.h b/ash/components/proximity_auth/fake_lock_handler.h similarity index 85% rename from chromeos/components/proximity_auth/fake_lock_handler.h rename to ash/components/proximity_auth/fake_lock_handler.h index 78dfd2196dfa6..73bf5273a2820 100644 --- a/chromeos/components/proximity_auth/fake_lock_handler.h +++ b/ash/components/proximity_auth/fake_lock_handler.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_FAKE_LOCK_HANDLER_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_FAKE_LOCK_HANDLER_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_FAKE_LOCK_HANDLER_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_FAKE_LOCK_HANDLER_H_ -#include "chromeos/components/proximity_auth/screenlock_bridge.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" namespace proximity_auth { @@ -43,4 +43,4 @@ class FakeLockHandler : public ScreenlockBridge::LockHandler { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_FAKE_LOCK_HANDLER_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_FAKE_LOCK_HANDLER_H_ diff --git a/chromeos/components/proximity_auth/fake_remote_device_life_cycle.cc b/ash/components/proximity_auth/fake_remote_device_life_cycle.cc similarity index 95% rename from chromeos/components/proximity_auth/fake_remote_device_life_cycle.cc rename to ash/components/proximity_auth/fake_remote_device_life_cycle.cc index 964436fbc9eb6..54793c9765d1d 100644 --- a/chromeos/components/proximity_auth/fake_remote_device_life_cycle.cc +++ b/ash/components/proximity_auth/fake_remote_device_life_cycle.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/components/proximity_auth/fake_remote_device_life_cycle.h" +#include "ash/components/proximity_auth/fake_remote_device_life_cycle.h" namespace proximity_auth { diff --git a/chromeos/components/proximity_auth/fake_remote_device_life_cycle.h b/ash/components/proximity_auth/fake_remote_device_life_cycle.h similarity index 87% rename from chromeos/components/proximity_auth/fake_remote_device_life_cycle.h rename to ash/components/proximity_auth/fake_remote_device_life_cycle.h index cbeadf10f4da7..92356dc1d4ac1 100644 --- a/chromeos/components/proximity_auth/fake_remote_device_life_cycle.h +++ b/ash/components/proximity_auth/fake_remote_device_life_cycle.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_FAKE_REMOTE_DEVICE_LIFE_CYCLE_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_FAKE_REMOTE_DEVICE_LIFE_CYCLE_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_FAKE_REMOTE_DEVICE_LIFE_CYCLE_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_FAKE_REMOTE_DEVICE_LIFE_CYCLE_H_ +#include "ash/components/proximity_auth/remote_device_life_cycle.h" #include "base/observer_list.h" #include "chromeos/components/multidevice/remote_device_ref.h" -#include "chromeos/components/proximity_auth/remote_device_life_cycle.h" #include "chromeos/services/secure_channel/fake_connection.h" #include "chromeos/services/secure_channel/public/cpp/client/client_channel.h" @@ -63,4 +63,4 @@ class FakeRemoteDeviceLifeCycle : public RemoteDeviceLifeCycle { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_FAKE_REMOTE_DEVICE_LIFE_CYCLE_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_FAKE_REMOTE_DEVICE_LIFE_CYCLE_H_ diff --git a/chromeos/components/proximity_auth/messenger.h b/ash/components/proximity_auth/messenger.h similarity index 89% rename from chromeos/components/proximity_auth/messenger.h rename to ash/components/proximity_auth/messenger.h index 51dece3ef1701..75e277430b62e 100644 --- a/chromeos/components/proximity_auth/messenger.h +++ b/ash/components/proximity_auth/messenger.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MESSENGER_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MESSENGER_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_MESSENGER_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_MESSENGER_H_ namespace chromeos { namespace secure_channel { @@ -43,4 +43,4 @@ class Messenger { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MESSENGER_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_MESSENGER_H_ diff --git a/chromeos/components/proximity_auth/messenger_impl.cc b/ash/components/proximity_auth/messenger_impl.cc similarity index 97% rename from chromeos/components/proximity_auth/messenger_impl.cc rename to ash/components/proximity_auth/messenger_impl.cc index ba2a96901a6ac..4dd83f9afe752 100644 --- a/chromeos/components/proximity_auth/messenger_impl.cc +++ b/ash/components/proximity_auth/messenger_impl.cc @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/messenger_impl.h" +#include "ash/components/proximity_auth/messenger_impl.h" #include #include +#include "ash/components/proximity_auth/messenger_observer.h" +#include "ash/components/proximity_auth/remote_status_update.h" #include "base/base64url.h" #include "base/bind.h" #include "base/json/json_reader.h" @@ -15,8 +17,6 @@ #include "base/threading/thread_task_runner_handle.h" #include "base/values.h" #include "chromeos/components/multidevice/logging/logging.h" -#include "chromeos/components/proximity_auth/messenger_observer.h" -#include "chromeos/components/proximity_auth/remote_status_update.h" namespace proximity_auth { diff --git a/chromeos/components/proximity_auth/messenger_impl.h b/ash/components/proximity_auth/messenger_impl.h similarity index 94% rename from chromeos/components/proximity_auth/messenger_impl.h rename to ash/components/proximity_auth/messenger_impl.h index da03a250eef95..6a90bc86f2dac 100644 --- a/chromeos/components/proximity_auth/messenger_impl.h +++ b/ash/components/proximity_auth/messenger_impl.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MESSENGER_IMPL_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MESSENGER_IMPL_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_MESSENGER_IMPL_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_MESSENGER_IMPL_H_ #include +#include "ash/components/proximity_auth/messenger.h" #include "base/containers/circular_deque.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "chromeos/components/proximity_auth/messenger.h" #include "chromeos/services/secure_channel/public/cpp/client/client_channel.h" namespace base { @@ -109,4 +109,4 @@ class MessengerImpl : public Messenger, } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MESSENGER_IMPL_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_MESSENGER_IMPL_H_ diff --git a/chromeos/components/proximity_auth/messenger_impl_unittest.cc b/ash/components/proximity_auth/messenger_impl_unittest.cc similarity index 98% rename from chromeos/components/proximity_auth/messenger_impl_unittest.cc rename to ash/components/proximity_auth/messenger_impl_unittest.cc index ce9640562c749..a643ae59e1fd9 100644 --- a/chromeos/components/proximity_auth/messenger_impl_unittest.cc +++ b/ash/components/proximity_auth/messenger_impl_unittest.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/messenger_impl.h" +#include "ash/components/proximity_auth/messenger_impl.h" #include +#include "ash/components/proximity_auth/messenger_observer.h" +#include "ash/components/proximity_auth/remote_status_update.h" #include "base/callback.h" #include "base/test/scoped_feature_list.h" #include "chromeos/components/multidevice/remote_device_ref.h" #include "chromeos/components/multidevice/remote_device_test_util.h" -#include "chromeos/components/proximity_auth/messenger_observer.h" -#include "chromeos/components/proximity_auth/remote_status_update.h" #include "chromeos/services/secure_channel/public/cpp/client/fake_client_channel.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chromeos/components/proximity_auth/messenger_observer.h b/ash/components/proximity_auth/messenger_observer.h similarity index 86% rename from chromeos/components/proximity_auth/messenger_observer.h rename to ash/components/proximity_auth/messenger_observer.h index ed33283c13d6f..997455c76e69c 100644 --- a/chromeos/components/proximity_auth/messenger_observer.h +++ b/ash/components/proximity_auth/messenger_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MESSENGER_OBSERVER_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MESSENGER_OBSERVER_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_MESSENGER_OBSERVER_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_MESSENGER_OBSERVER_H_ #include #include @@ -37,4 +37,4 @@ class MessengerObserver { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MESSENGER_OBSERVER_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_MESSENGER_OBSERVER_H_ diff --git a/chromeos/components/proximity_auth/metrics.cc b/ash/components/proximity_auth/metrics.cc similarity index 97% rename from chromeos/components/proximity_auth/metrics.cc rename to ash/components/proximity_auth/metrics.cc index fe6745184b52e..d89d3f680a23f 100644 --- a/chromeos/components/proximity_auth/metrics.cc +++ b/ash/components/proximity_auth/metrics.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/components/proximity_auth/metrics.h" +#include "ash/components/proximity_auth/metrics.h" #include diff --git a/chromeos/components/proximity_auth/metrics.h b/ash/components/proximity_auth/metrics.h similarity index 90% rename from chromeos/components/proximity_auth/metrics.h rename to ash/components/proximity_auth/metrics.h index 295d04c2a57ff..3c4b2c86c4aa7 100644 --- a/chromeos/components/proximity_auth/metrics.h +++ b/ash/components/proximity_auth/metrics.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_METRICS_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_METRICS_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_METRICS_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_METRICS_H_ #include @@ -43,4 +43,4 @@ void RecordRemoteSecuritySettingsState(RemoteSecuritySettingsState state); } // namespace metrics } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_METRICS_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_METRICS_H_ diff --git a/chromeos/components/proximity_auth/mock_proximity_auth_client.cc b/ash/components/proximity_auth/mock_proximity_auth_client.cc similarity index 83% rename from chromeos/components/proximity_auth/mock_proximity_auth_client.cc rename to ash/components/proximity_auth/mock_proximity_auth_client.cc index 87e624d541a3b..e4e6490c50588 100644 --- a/chromeos/components/proximity_auth/mock_proximity_auth_client.cc +++ b/ash/components/proximity_auth/mock_proximity_auth_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/mock_proximity_auth_client.h" +#include "ash/components/proximity_auth/mock_proximity_auth_client.h" #include "base/memory/ptr_util.h" diff --git a/chromeos/components/proximity_auth/mock_proximity_auth_client.h b/ash/components/proximity_auth/mock_proximity_auth_client.h similarity index 81% rename from chromeos/components/proximity_auth/mock_proximity_auth_client.h rename to ash/components/proximity_auth/mock_proximity_auth_client.h index 5abaa4ca42a13..8aa44f9d6d05e 100644 --- a/chromeos/components/proximity_auth/mock_proximity_auth_client.h +++ b/ash/components/proximity_auth/mock_proximity_auth_client.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MOCK_PROXIMITY_AUTH_CLIENT_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MOCK_PROXIMITY_AUTH_CLIENT_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_MOCK_PROXIMITY_AUTH_CLIENT_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_MOCK_PROXIMITY_AUTH_CLIENT_H_ #include +#include "ash/components/proximity_auth/proximity_auth_client.h" #include "base/callback.h" -#include "chromeos/components/proximity_auth/proximity_auth_client.h" #include "testing/gmock/include/gmock/gmock.h" namespace proximity_auth { @@ -39,4 +39,4 @@ class MockProximityAuthClient : public ProximityAuthClient { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_MOCK_PROXIMITY_AUTH_CLIENT_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_MOCK_PROXIMITY_AUTH_CLIENT_H_ diff --git a/chromeos/components/proximity_auth/proximity_auth_client.h b/ash/components/proximity_auth/proximity_auth_client.h similarity index 87% rename from chromeos/components/proximity_auth/proximity_auth_client.h rename to ash/components/proximity_auth/proximity_auth_client.h index cb46c14558a68..4dcdedcf82899 100644 --- a/chromeos/components/proximity_auth/proximity_auth_client.h +++ b/ash/components/proximity_auth/proximity_auth_client.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_CLIENT_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_CLIENT_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_CLIENT_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_CLIENT_H_ #include #include +#include "ash/components/proximity_auth/proximity_auth_pref_manager.h" #include "ash/public/cpp/smartlock_state.h" #include "base/callback_forward.h" -#include "chromeos/components/proximity_auth/proximity_auth_pref_manager.h" #include "chromeos/services/device_sync/proto/cryptauth_api.pb.h" namespace proximity_auth { @@ -52,4 +52,4 @@ class ProximityAuthClient { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_CLIENT_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_CLIENT_H_ diff --git a/chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.cc b/ash/components/proximity_auth/proximity_auth_local_state_pref_manager.cc similarity index 97% rename from chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.cc rename to ash/components/proximity_auth/proximity_auth_local_state_pref_manager.cc index 04ab17936e536..c1b344b62548d 100644 --- a/chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.cc +++ b/ash/components/proximity_auth/proximity_auth_local_state_pref_manager.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.h" +#include "ash/components/proximity_auth/proximity_auth_local_state_pref_manager.h" #include #include +#include "ash/components/proximity_auth/proximity_auth_pref_names.h" #include "base/logging.h" #include "base/values.h" #include "chromeos/components/multidevice/logging/logging.h" -#include "chromeos/components/proximity_auth/proximity_auth_pref_names.h" #include "chromeos/services/multidevice_setup/public/cpp/prefs.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" diff --git a/chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.h b/ash/components/proximity_auth/proximity_auth_local_state_pref_manager.h similarity index 89% rename from chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.h rename to ash/components/proximity_auth/proximity_auth_local_state_pref_manager.h index f87de9cbce556..8037597afae8e 100644 --- a/chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.h +++ b/ash/components/proximity_auth/proximity_auth_local_state_pref_manager.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_LOCAL_STATE_PREF_MANAGER_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_LOCAL_STATE_PREF_MANAGER_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_LOCAL_STATE_PREF_MANAGER_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_LOCAL_STATE_PREF_MANAGER_H_ -#include "chromeos/components/proximity_auth/proximity_auth_pref_manager.h" +#include "ash/components/proximity_auth/proximity_auth_pref_manager.h" #include "components/account_id/account_id.h" class PrefRegistrySimple; @@ -74,4 +74,4 @@ class ProximityAuthLocalStatePrefManager : public ProximityAuthPrefManager { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_LOCAL_STATE_PREF_MANAGER_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_LOCAL_STATE_PREF_MANAGER_H_ diff --git a/chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager_unittest.cc b/ash/components/proximity_auth/proximity_auth_local_state_pref_manager_unittest.cc similarity index 97% rename from chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager_unittest.cc rename to ash/components/proximity_auth/proximity_auth_local_state_pref_manager_unittest.cc index 0ba3377277171..2fafe629a8f82 100644 --- a/chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager_unittest.cc +++ b/ash/components/proximity_auth/proximity_auth_local_state_pref_manager_unittest.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.h" +#include "ash/components/proximity_auth/proximity_auth_local_state_pref_manager.h" #include #include #include +#include "ash/components/proximity_auth/proximity_auth_pref_names.h" #include "base/json/json_reader.h" -#include "chromeos/components/proximity_auth/proximity_auth_pref_names.h" #include "chromeos/services/multidevice_setup/public/cpp/prefs.h" #include "components/prefs/scoped_user_pref_update.h" #include "components/prefs/testing_pref_service.h" diff --git a/chromeos/components/proximity_auth/proximity_auth_pref_manager.h b/ash/components/proximity_auth/proximity_auth_pref_manager.h similarity index 92% rename from chromeos/components/proximity_auth/proximity_auth_pref_manager.h rename to ash/components/proximity_auth/proximity_auth_pref_manager.h index 697d22454aa43..4938a4deb2b18 100644 --- a/chromeos/components/proximity_auth/proximity_auth_pref_manager.h +++ b/ash/components/proximity_auth/proximity_auth_pref_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_MANAGER_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_MANAGER_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_MANAGER_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_MANAGER_H_ #include @@ -70,4 +70,4 @@ class ProximityAuthPrefManager { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_MANAGER_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_MANAGER_H_ diff --git a/chromeos/components/proximity_auth/proximity_auth_pref_names.cc b/ash/components/proximity_auth/proximity_auth_pref_names.cc similarity index 96% rename from chromeos/components/proximity_auth/proximity_auth_pref_names.cc rename to ash/components/proximity_auth/proximity_auth_pref_names.cc index c66adf4f56e7a..d6ebef095df6d 100644 --- a/chromeos/components/proximity_auth/proximity_auth_pref_names.cc +++ b/ash/components/proximity_auth/proximity_auth_pref_names.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/components/proximity_auth/proximity_auth_pref_names.h" +#include "ash/components/proximity_auth/proximity_auth_pref_names.h" namespace proximity_auth { namespace prefs { diff --git a/chromeos/components/proximity_auth/proximity_auth_pref_names.h b/ash/components/proximity_auth/proximity_auth_pref_names.h similarity index 76% rename from chromeos/components/proximity_auth/proximity_auth_pref_names.h rename to ash/components/proximity_auth/proximity_auth_pref_names.h index aaf96a335a101..7ba568ff272ab 100644 --- a/chromeos/components/proximity_auth/proximity_auth_pref_names.h +++ b/ash/components/proximity_auth/proximity_auth_pref_names.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_NAMES_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_NAMES_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_NAMES_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_NAMES_H_ namespace proximity_auth { namespace prefs { @@ -20,4 +20,4 @@ extern const char kProximityAuthHasShownLoginDisabledMessage[]; } // namespace prefs } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_NAMES_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PREF_NAMES_H_ diff --git a/chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.cc b/ash/components/proximity_auth/proximity_auth_profile_pref_manager.cc similarity index 98% rename from chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.cc rename to ash/components/proximity_auth/proximity_auth_profile_pref_manager.cc index 4af7fa7dd9640..58bb791fd0a9f 100644 --- a/chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.cc +++ b/ash/components/proximity_auth/proximity_auth_profile_pref_manager.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.h" +#include "ash/components/proximity_auth/proximity_auth_profile_pref_manager.h" #include #include +#include "ash/components/proximity_auth/proximity_auth_pref_names.h" #include "base/bind.h" #include "base/values.h" #include "chromeos/components/multidevice/logging/logging.h" -#include "chromeos/components/proximity_auth/proximity_auth_pref_names.h" #include "chromeos/services/multidevice_setup/public/cpp/prefs.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" diff --git a/chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.h b/ash/components/proximity_auth/proximity_auth_profile_pref_manager.h similarity index 92% rename from chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.h rename to ash/components/proximity_auth/proximity_auth_profile_pref_manager.h index 34cc5709c7438..d90eda868b040 100644 --- a/chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.h +++ b/ash/components/proximity_auth/proximity_auth_profile_pref_manager.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_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PROFILE_PREF_MANAGER_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PROFILE_PREF_MANAGER_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PROFILE_PREF_MANAGER_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PROFILE_PREF_MANAGER_H_ +#include "ash/components/proximity_auth/proximity_auth_pref_manager.h" #include "base/memory/weak_ptr.h" -#include "chromeos/components/proximity_auth/proximity_auth_pref_manager.h" #include "chromeos/services/multidevice_setup/public/cpp/multidevice_setup_client.h" #include "components/account_id/account_id.h" #include "components/prefs/pref_change_registrar.h" @@ -102,4 +102,4 @@ class ProximityAuthProfilePrefManager } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PROFILE_PREF_MANAGER_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_PROFILE_PREF_MANAGER_H_ diff --git a/chromeos/components/proximity_auth/proximity_auth_profile_pref_manager_unittest.cc b/ash/components/proximity_auth/proximity_auth_profile_pref_manager_unittest.cc similarity index 96% rename from chromeos/components/proximity_auth/proximity_auth_profile_pref_manager_unittest.cc rename to ash/components/proximity_auth/proximity_auth_profile_pref_manager_unittest.cc index 808869e425f5b..099da03b23564 100644 --- a/chromeos/components/proximity_auth/proximity_auth_profile_pref_manager_unittest.cc +++ b/ash/components/proximity_auth/proximity_auth_profile_pref_manager_unittest.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.h" +#include "ash/components/proximity_auth/proximity_auth_profile_pref_manager.h" #include #include #include #include -#include "chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.h" -#include "chromeos/components/proximity_auth/proximity_auth_pref_names.h" +#include "ash/components/proximity_auth/proximity_auth_local_state_pref_manager.h" +#include "ash/components/proximity_auth/proximity_auth_pref_names.h" #include "chromeos/services/multidevice_setup/public/cpp/fake_multidevice_setup_client.h" #include "chromeos/services/multidevice_setup/public/cpp/prefs.h" #include "components/prefs/testing_pref_service.h" diff --git a/chromeos/components/proximity_auth/proximity_auth_system.cc b/ash/components/proximity_auth/proximity_auth_system.cc similarity index 95% rename from chromeos/components/proximity_auth/proximity_auth_system.cc rename to ash/components/proximity_auth/proximity_auth_system.cc index eb3b356c27365..6e978d30da47f 100644 --- a/chromeos/components/proximity_auth/proximity_auth_system.cc +++ b/ash/components/proximity_auth/proximity_auth_system.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/proximity_auth_system.h" +#include "ash/components/proximity_auth/proximity_auth_system.h" +#include "ash/components/proximity_auth/proximity_auth_client.h" +#include "ash/components/proximity_auth/remote_device_life_cycle_impl.h" +#include "ash/components/proximity_auth/unlock_manager_impl.h" #include "chromeos/components/multidevice/logging/logging.h" -#include "chromeos/components/proximity_auth/proximity_auth_client.h" -#include "chromeos/components/proximity_auth/remote_device_life_cycle_impl.h" -#include "chromeos/components/proximity_auth/unlock_manager_impl.h" #include "chromeos/services/secure_channel/public/cpp/client/secure_channel_client.h" namespace proximity_auth { diff --git a/chromeos/components/proximity_auth/proximity_auth_system.h b/ash/components/proximity_auth/proximity_auth_system.h similarity index 94% rename from chromeos/components/proximity_auth/proximity_auth_system.h rename to ash/components/proximity_auth/proximity_auth_system.h index 6d911e690fcaa..669760eef16b0 100644 --- a/chromeos/components/proximity_auth/proximity_auth_system.h +++ b/ash/components/proximity_auth/proximity_auth_system.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H_ #include #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "chromeos/components/multidevice/remote_device_ref.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "components/account_id/account_id.h" namespace chromeos { @@ -135,4 +135,4 @@ class ProximityAuthSystem : public ScreenlockBridge::Observer { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_AUTH_SYSTEM_H_ diff --git a/chromeos/components/proximity_auth/proximity_auth_system_unittest.cc b/ash/components/proximity_auth/proximity_auth_system_unittest.cc similarity index 97% rename from chromeos/components/proximity_auth/proximity_auth_system_unittest.cc rename to ash/components/proximity_auth/proximity_auth_system_unittest.cc index a7f3f449d40e1..c108d25b7dd92 100644 --- a/chromeos/components/proximity_auth/proximity_auth_system_unittest.cc +++ b/ash/components/proximity_auth/proximity_auth_system_unittest.cc @@ -2,10 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/proximity_auth_system.h" +#include "ash/components/proximity_auth/proximity_auth_system.h" #include +#include "ash/components/proximity_auth/fake_lock_handler.h" +#include "ash/components/proximity_auth/fake_remote_device_life_cycle.h" +#include "ash/components/proximity_auth/mock_proximity_auth_client.h" +#include "ash/components/proximity_auth/proximity_auth_profile_pref_manager.h" +#include "ash/components/proximity_auth/unlock_manager.h" #include "base/command_line.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_simple_task_runner.h" @@ -14,11 +19,6 @@ #include "chromeos/components/multidevice/remote_device_ref.h" #include "chromeos/components/multidevice/remote_device_test_util.h" #include "chromeos/components/multidevice/software_feature_state.h" -#include "chromeos/components/proximity_auth/fake_lock_handler.h" -#include "chromeos/components/proximity_auth/fake_remote_device_life_cycle.h" -#include "chromeos/components/proximity_auth/mock_proximity_auth_client.h" -#include "chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.h" -#include "chromeos/components/proximity_auth/unlock_manager.h" #include "chromeos/services/multidevice_setup/public/cpp/fake_multidevice_setup_client.h" #include "chromeos/services/secure_channel/public/cpp/client/fake_secure_channel_client.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chromeos/components/proximity_auth/proximity_monitor.cc b/ash/components/proximity_auth/proximity_monitor.cc similarity index 91% rename from chromeos/components/proximity_auth/proximity_monitor.cc rename to ash/components/proximity_auth/proximity_monitor.cc index aebaefb3f617c..289255a472544 100644 --- a/chromeos/components/proximity_auth/proximity_monitor.cc +++ b/ash/components/proximity_auth/proximity_monitor.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/components/proximity_auth/proximity_monitor.h" +#include "ash/components/proximity_auth/proximity_monitor.h" namespace proximity_auth { diff --git a/chromeos/components/proximity_auth/proximity_monitor.h b/ash/components/proximity_auth/proximity_monitor.h similarity index 83% rename from chromeos/components/proximity_auth/proximity_monitor.h rename to ash/components/proximity_auth/proximity_monitor.h index 0f56a21431140..778d6595ad75f 100644 --- a/chromeos/components/proximity_auth/proximity_monitor.h +++ b/ash/components/proximity_auth/proximity_monitor.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_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_H_ +#include "ash/components/proximity_auth/proximity_monitor_observer.h" #include "base/observer_list.h" -#include "chromeos/components/proximity_auth/proximity_monitor_observer.h" namespace proximity_auth { @@ -46,4 +46,4 @@ class ProximityMonitor { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_H_ diff --git a/chromeos/components/proximity_auth/proximity_monitor_impl.cc b/ash/components/proximity_auth/proximity_monitor_impl.cc similarity index 97% rename from chromeos/components/proximity_auth/proximity_monitor_impl.cc rename to ash/components/proximity_auth/proximity_monitor_impl.cc index 6a6d0160b281b..a1d434cc44bec 100644 --- a/chromeos/components/proximity_auth/proximity_monitor_impl.cc +++ b/ash/components/proximity_auth/proximity_monitor_impl.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/proximity_monitor_impl.h" +#include "ash/components/proximity_auth/proximity_monitor_impl.h" #include #include #include +#include "ash/components/proximity_auth/metrics.h" #include "base/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "chromeos/components/multidevice/logging/logging.h" -#include "chromeos/components/proximity_auth/metrics.h" #include "chromeos/services/secure_channel/public/cpp/client/client_channel.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_adapter_factory.h" diff --git a/chromeos/components/proximity_auth/proximity_monitor_impl.h b/ash/components/proximity_auth/proximity_monitor_impl.h similarity index 93% rename from chromeos/components/proximity_auth/proximity_monitor_impl.h rename to ash/components/proximity_auth/proximity_monitor_impl.h index 26852a872f0bf..95938f08a6553 100644 --- a/chromeos/components/proximity_auth/proximity_monitor_impl.h +++ b/ash/components/proximity_auth/proximity_monitor_impl.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_IMPL_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_IMPL_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_IMPL_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_IMPL_H_ #include +#include "ash/components/proximity_auth/proximity_monitor.h" #include "base/memory/weak_ptr.h" #include "chromeos/components/multidevice/remote_device_ref.h" -#include "chromeos/components/proximity_auth/proximity_monitor.h" #include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h" #include "device/bluetooth/bluetooth_device.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -117,4 +117,4 @@ class ProximityMonitorImpl : public ProximityMonitor { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_IMPL_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_IMPL_H_ diff --git a/chromeos/components/proximity_auth/proximity_monitor_impl_unittest.cc b/ash/components/proximity_auth/proximity_monitor_impl_unittest.cc similarity index 98% rename from chromeos/components/proximity_auth/proximity_monitor_impl_unittest.cc rename to ash/components/proximity_auth/proximity_monitor_impl_unittest.cc index bd0fee31ea933..3e7d1e4decf06 100644 --- a/chromeos/components/proximity_auth/proximity_monitor_impl_unittest.cc +++ b/ash/components/proximity_auth/proximity_monitor_impl_unittest.cc @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/proximity_monitor_impl.h" +#include "ash/components/proximity_auth/proximity_monitor_impl.h" #include #include +#include "ash/components/proximity_auth/proximity_monitor_observer.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/test/gmock_move_support.h" @@ -20,7 +21,6 @@ #include "chromeos/components/multidevice/remote_device_ref.h" #include "chromeos/components/multidevice/remote_device_test_util.h" #include "chromeos/components/multidevice/software_feature_state.h" -#include "chromeos/components/proximity_auth/proximity_monitor_observer.h" #include "chromeos/services/multidevice_setup/public/cpp/fake_multidevice_setup_client.h" #include "chromeos/services/secure_channel/fake_connection.h" #include "chromeos/services/secure_channel/public/cpp/client/fake_client_channel.h" diff --git a/chromeos/components/proximity_auth/proximity_monitor_observer.h b/ash/components/proximity_auth/proximity_monitor_observer.h similarity index 69% rename from chromeos/components/proximity_auth/proximity_monitor_observer.h rename to ash/components/proximity_auth/proximity_monitor_observer.h index bfb856d3c747e..a685a3ad08f06 100644 --- a/chromeos/components/proximity_auth/proximity_monitor_observer.h +++ b/ash/components/proximity_auth/proximity_monitor_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_OBSERVER_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_OBSERVER_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_OBSERVER_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_OBSERVER_H_ namespace proximity_auth { @@ -19,4 +19,4 @@ class ProximityMonitorObserver { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_OBSERVER_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_OBSERVER_H_ diff --git a/chromeos/components/proximity_auth/public/mojom/BUILD.gn b/ash/components/proximity_auth/public/mojom/BUILD.gn similarity index 68% rename from chromeos/components/proximity_auth/public/mojom/BUILD.gn rename to ash/components/proximity_auth/public/mojom/BUILD.gn index c3d4a0b8c9022..e205c9951ec4d 100644 --- a/chromeos/components/proximity_auth/public/mojom/BUILD.gn +++ b/ash/components/proximity_auth/public/mojom/BUILD.gn @@ -2,8 +2,11 @@ # 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("//mojo/public/tools/bindings/mojom.gni") +assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") + mojom("mojom") { sources = [ "auth_type.mojom" ] } diff --git a/chromeos/components/proximity_auth/public/mojom/OWNERS b/ash/components/proximity_auth/public/mojom/OWNERS similarity index 100% rename from chromeos/components/proximity_auth/public/mojom/OWNERS rename to ash/components/proximity_auth/public/mojom/OWNERS diff --git a/chromeos/components/proximity_auth/public/mojom/auth_type.mojom b/ash/components/proximity_auth/public/mojom/auth_type.mojom similarity index 100% rename from chromeos/components/proximity_auth/public/mojom/auth_type.mojom rename to ash/components/proximity_auth/public/mojom/auth_type.mojom diff --git a/chromeos/components/proximity_auth/remote_device_life_cycle.cc b/ash/components/proximity_auth/remote_device_life_cycle.cc similarity index 88% rename from chromeos/components/proximity_auth/remote_device_life_cycle.cc rename to ash/components/proximity_auth/remote_device_life_cycle.cc index 7ce1157f21128..974eb6de5638f 100644 --- a/chromeos/components/proximity_auth/remote_device_life_cycle.cc +++ b/ash/components/proximity_auth/remote_device_life_cycle.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/components/proximity_auth/remote_device_life_cycle.h" +#include "ash/components/proximity_auth/remote_device_life_cycle.h" namespace proximity_auth { diff --git a/chromeos/components/proximity_auth/remote_device_life_cycle.h b/ash/components/proximity_auth/remote_device_life_cycle.h similarity index 93% rename from chromeos/components/proximity_auth/remote_device_life_cycle.h rename to ash/components/proximity_auth/remote_device_life_cycle.h index 188def4b27330..59d6b4127807c 100644 --- a/chromeos/components/proximity_auth/remote_device_life_cycle.h +++ b/ash/components/proximity_auth/remote_device_life_cycle.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_H_ #include @@ -88,4 +88,4 @@ std::ostream& operator<<(std::ostream& stream, } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_H_ diff --git a/chromeos/components/proximity_auth/remote_device_life_cycle_impl.cc b/ash/components/proximity_auth/remote_device_life_cycle_impl.cc similarity index 97% rename from chromeos/components/proximity_auth/remote_device_life_cycle_impl.cc rename to ash/components/proximity_auth/remote_device_life_cycle_impl.cc index 3e8ddc28c9817..452ea5ea1c329 100644 --- a/chromeos/components/proximity_auth/remote_device_life_cycle_impl.cc +++ b/ash/components/proximity_auth/remote_device_life_cycle_impl.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/remote_device_life_cycle_impl.h" +#include "ash/components/proximity_auth/remote_device_life_cycle_impl.h" #include +#include "ash/components/proximity_auth/messenger_impl.h" #include "base/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "chromeos/components/multidevice/logging/logging.h" -#include "chromeos/components/proximity_auth/messenger_impl.h" #include "chromeos/services/secure_channel/public/cpp/client/secure_channel_client.h" #include "chromeos/services/secure_channel/public/cpp/shared/connection_priority.h" diff --git a/chromeos/components/proximity_auth/remote_device_life_cycle_impl.h b/ash/components/proximity_auth/remote_device_life_cycle_impl.h similarity index 91% rename from chromeos/components/proximity_auth/remote_device_life_cycle_impl.h rename to ash/components/proximity_auth/remote_device_life_cycle_impl.h index 2ed295cb4ce44..30a6cc5653ff8 100644 --- a/chromeos/components/proximity_auth/remote_device_life_cycle_impl.h +++ b/ash/components/proximity_auth/remote_device_life_cycle_impl.h @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_IMPL_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_IMPL_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_IMPL_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_IMPL_H_ #include +#include "ash/components/proximity_auth/messenger_observer.h" +#include "ash/components/proximity_auth/remote_device_life_cycle.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/timer/timer.h" #include "chromeos/components/multidevice/remote_device_ref.h" -#include "chromeos/components/proximity_auth/messenger_observer.h" -#include "chromeos/components/proximity_auth/remote_device_life_cycle.h" #include "chromeos/services/secure_channel/public/cpp/client/connection_attempt.h" #include "chromeos/services/secure_channel/public/cpp/client/secure_channel_client.h" #include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h" @@ -113,4 +113,4 @@ class RemoteDeviceLifeCycleImpl } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_IMPL_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_REMOTE_DEVICE_LIFE_CYCLE_IMPL_H_ diff --git a/chromeos/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc b/ash/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc similarity index 98% rename from chromeos/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc rename to ash/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc index f4304377882db..89aaa7e6aa8fd 100644 --- a/chromeos/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc +++ b/ash/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/remote_device_life_cycle_impl.h" +#include "ash/components/proximity_auth/remote_device_life_cycle_impl.h" #include #include #include +#include "ash/components/proximity_auth/messenger.h" #include "base/callback.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_simple_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "chromeos/components/multidevice/remote_device_ref.h" #include "chromeos/components/multidevice/remote_device_test_util.h" -#include "chromeos/components/proximity_auth/messenger.h" #include "chromeos/services/secure_channel/public/cpp/client/fake_client_channel.h" #include "chromeos/services/secure_channel/public/cpp/client/fake_connection_attempt.h" #include "chromeos/services/secure_channel/public/cpp/client/fake_secure_channel_client.h" diff --git a/chromeos/components/proximity_auth/remote_status_update.cc b/ash/components/proximity_auth/remote_status_update.cc similarity index 98% rename from chromeos/components/proximity_auth/remote_status_update.cc rename to ash/components/proximity_auth/remote_status_update.cc index e1e3954410f3e..28e7675530b75 100644 --- a/chromeos/components/proximity_auth/remote_status_update.cc +++ b/ash/components/proximity_auth/remote_status_update.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/components/proximity_auth/remote_status_update.h" +#include "ash/components/proximity_auth/remote_status_update.h" #include "base/values.h" #include "chromeos/components/multidevice/logging/logging.h" diff --git a/chromeos/components/proximity_auth/remote_status_update.h b/ash/components/proximity_auth/remote_status_update.h similarity index 87% rename from chromeos/components/proximity_auth/remote_status_update.h rename to ash/components/proximity_auth/remote_status_update.h index de07ca3dc4bfa..672366f60c2c3 100644 --- a/chromeos/components/proximity_auth/remote_status_update.h +++ b/ash/components/proximity_auth/remote_status_update.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_REMOTE_STATUS_UPDATE_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_REMOTE_STATUS_UPDATE_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_REMOTE_STATUS_UPDATE_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_REMOTE_STATUS_UPDATE_H_ #include @@ -52,4 +52,4 @@ struct RemoteStatusUpdate { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_REMOTE_STATUS_UPDATE_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_REMOTE_STATUS_UPDATE_H_ diff --git a/chromeos/components/proximity_auth/remote_status_update_unittest.cc b/ash/components/proximity_auth/remote_status_update_unittest.cc similarity index 99% rename from chromeos/components/proximity_auth/remote_status_update_unittest.cc rename to ash/components/proximity_auth/remote_status_update_unittest.cc index 8d742d2a2c23a..553b2a0898c81 100644 --- a/chromeos/components/proximity_auth/remote_status_update_unittest.cc +++ b/ash/components/proximity_auth/remote_status_update_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/remote_status_update.h" +#include "ash/components/proximity_auth/remote_status_update.h" #include "base/json/json_reader.h" #include "base/values.h" diff --git a/chromeos/components/proximity_auth/run_all_unittests.cc b/ash/components/proximity_auth/run_all_unittests.cc similarity index 100% rename from chromeos/components/proximity_auth/run_all_unittests.cc rename to ash/components/proximity_auth/run_all_unittests.cc diff --git a/chromeos/components/proximity_auth/screenlock_bridge.cc b/ash/components/proximity_auth/screenlock_bridge.cc similarity index 98% rename from chromeos/components/proximity_auth/screenlock_bridge.cc rename to ash/components/proximity_auth/screenlock_bridge.cc index ec48fd5d53e95..f10b8fee755e4 100644 --- a/chromeos/components/proximity_auth/screenlock_bridge.cc +++ b/ash/components/proximity_auth/screenlock_bridge.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/components/proximity_auth/screenlock_bridge.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" #include #include diff --git a/chromeos/components/proximity_auth/screenlock_bridge.h b/ash/components/proximity_auth/screenlock_bridge.h similarity index 96% rename from chromeos/components/proximity_auth/screenlock_bridge.h rename to ash/components/proximity_auth/screenlock_bridge.h index ed98ea72e92e8..12076198df1fe 100644 --- a/chromeos/components/proximity_auth/screenlock_bridge.h +++ b/ash/components/proximity_auth/screenlock_bridge.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_ #include #include +#include "ash/components/proximity_auth/public/mojom/auth_type.mojom.h" #include "base/lazy_instance.h" #include "base/observer_list.h" #include "base/values.h" -#include "chromeos/components/proximity_auth/public/mojom/auth_type.mojom.h" #include "components/account_id/account_id.h" namespace ash { @@ -199,4 +199,4 @@ class ScreenlockBridge { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_ diff --git a/chromeos/components/proximity_auth/smart_lock_metrics_recorder.cc b/ash/components/proximity_auth/smart_lock_metrics_recorder.cc similarity index 97% rename from chromeos/components/proximity_auth/smart_lock_metrics_recorder.cc rename to ash/components/proximity_auth/smart_lock_metrics_recorder.cc index 905d41424e5f8..116c98a6b5ef0 100644 --- a/chromeos/components/proximity_auth/smart_lock_metrics_recorder.cc +++ b/ash/components/proximity_auth/smart_lock_metrics_recorder.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/components/proximity_auth/smart_lock_metrics_recorder.h" +#include "ash/components/proximity_auth/smart_lock_metrics_recorder.h" #include "base/metrics/histogram_macros.h" diff --git a/chromeos/components/proximity_auth/smart_lock_metrics_recorder.h b/ash/components/proximity_auth/smart_lock_metrics_recorder.h similarity index 94% rename from chromeos/components/proximity_auth/smart_lock_metrics_recorder.h rename to ash/components/proximity_auth/smart_lock_metrics_recorder.h index ad8bac324c0e3..a8d2d254d1ada 100644 --- a/chromeos/components/proximity_auth/smart_lock_metrics_recorder.h +++ b/ash/components/proximity_auth/smart_lock_metrics_recorder.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_SMART_LOCK_METRICS_RECORDER_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_SMART_LOCK_METRICS_RECORDER_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_SMART_LOCK_METRICS_RECORDER_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_SMART_LOCK_METRICS_RECORDER_H_ class SmartLockMetricsRecorder { public: @@ -120,4 +120,4 @@ class SmartLockMetricsRecorder { static UsageRecorder* g_usage_recorder; }; -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_SMART_LOCK_METRICS_RECORDER_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_SMART_LOCK_METRICS_RECORDER_H_ diff --git a/chromeos/components/proximity_auth/unlock_manager.h b/ash/components/proximity_auth/unlock_manager.h similarity index 84% rename from chromeos/components/proximity_auth/unlock_manager.h rename to ash/components/proximity_auth/unlock_manager.h index f13e45916eab6..ef004b17d26f8 100644 --- a/chromeos/components/proximity_auth/unlock_manager.h +++ b/ash/components/proximity_auth/unlock_manager.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_H_ +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_H_ -#include "chromeos/components/proximity_auth/screenlock_bridge.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" namespace proximity_auth { @@ -41,4 +41,4 @@ class UnlockManager { } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_H_ diff --git a/chromeos/components/proximity_auth/unlock_manager_impl.cc b/ash/components/proximity_auth/unlock_manager_impl.cc similarity index 99% rename from chromeos/components/proximity_auth/unlock_manager_impl.cc rename to ash/components/proximity_auth/unlock_manager_impl.cc index 5c136f7b6d2a8..24ef20cb9d714 100644 --- a/chromeos/components/proximity_auth/unlock_manager_impl.cc +++ b/ash/components/proximity_auth/unlock_manager_impl.cc @@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/unlock_manager_impl.h" +#include "ash/components/proximity_auth/unlock_manager_impl.h" #include +#include "ash/components/proximity_auth/messenger.h" +#include "ash/components/proximity_auth/metrics.h" +#include "ash/components/proximity_auth/proximity_auth_client.h" +#include "ash/components/proximity_auth/proximity_monitor_impl.h" #include "base/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" @@ -15,10 +19,6 @@ #include "base/timer/timer.h" #include "chromeos/components/multidevice/logging/logging.h" #include "chromeos/components/multidevice/remote_device_ref.h" -#include "chromeos/components/proximity_auth/messenger.h" -#include "chromeos/components/proximity_auth/metrics.h" -#include "chromeos/components/proximity_auth/proximity_auth_client.h" -#include "chromeos/components/proximity_auth/proximity_monitor_impl.h" #include "chromeos/services/secure_channel/public/cpp/client/client_channel.h" #include "device/bluetooth/bluetooth_adapter_factory.h" diff --git a/chromeos/components/proximity_auth/unlock_manager_impl.h b/ash/components/proximity_auth/unlock_manager_impl.h similarity index 94% rename from chromeos/components/proximity_auth/unlock_manager_impl.h rename to ash/components/proximity_auth/unlock_manager_impl.h index 520f68685476d..65140e80a90dc 100644 --- a/chromeos/components/proximity_auth/unlock_manager_impl.h +++ b/ash/components/proximity_auth/unlock_manager_impl.h @@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROMEOS_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_IMPL_H_ -#define CHROMEOS_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_IMPL_H_ - +#ifndef ASH_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_IMPL_H_ +#define ASH_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_IMPL_H_ + +#include "ash/components/proximity_auth/messenger_observer.h" +#include "ash/components/proximity_auth/proximity_auth_system.h" +#include "ash/components/proximity_auth/proximity_monitor_observer.h" +#include "ash/components/proximity_auth/remote_device_life_cycle.h" +#include "ash/components/proximity_auth/remote_status_update.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" +#include "ash/components/proximity_auth/smart_lock_metrics_recorder.h" +#include "ash/components/proximity_auth/unlock_manager.h" #include "ash/public/cpp/smartlock_state.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "build/build_config.h" -#include "chromeos/components/proximity_auth/messenger_observer.h" -#include "chromeos/components/proximity_auth/proximity_auth_system.h" -#include "chromeos/components/proximity_auth/proximity_monitor_observer.h" -#include "chromeos/components/proximity_auth/remote_device_life_cycle.h" -#include "chromeos/components/proximity_auth/remote_status_update.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" -#include "chromeos/components/proximity_auth/smart_lock_metrics_recorder.h" -#include "chromeos/components/proximity_auth/unlock_manager.h" #include "chromeos/dbus/power/power_manager_client.h" #include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h" #include "device/bluetooth/bluetooth_adapter.h" @@ -322,4 +322,4 @@ class UnlockManagerImpl : public UnlockManager, } // namespace proximity_auth -#endif // CHROMEOS_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_IMPL_H_ +#endif // ASH_COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_IMPL_H_ diff --git a/chromeos/components/proximity_auth/unlock_manager_impl_unittest.cc b/ash/components/proximity_auth/unlock_manager_impl_unittest.cc similarity index 98% rename from chromeos/components/proximity_auth/unlock_manager_impl_unittest.cc rename to ash/components/proximity_auth/unlock_manager_impl_unittest.cc index f1ee763aec906..19e6008b0fe9e 100644 --- a/chromeos/components/proximity_auth/unlock_manager_impl_unittest.cc +++ b/ash/components/proximity_auth/unlock_manager_impl_unittest.cc @@ -2,11 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/components/proximity_auth/unlock_manager_impl.h" +#include "ash/components/proximity_auth/unlock_manager_impl.h" #include #include +#include "ash/components/proximity_auth/fake_lock_handler.h" +#include "ash/components/proximity_auth/fake_remote_device_life_cycle.h" +#include "ash/components/proximity_auth/messenger.h" +#include "ash/components/proximity_auth/mock_proximity_auth_client.h" +#include "ash/components/proximity_auth/proximity_monitor.h" +#include "ash/components/proximity_auth/remote_device_life_cycle.h" +#include "ash/components/proximity_auth/remote_status_update.h" #include "base/memory/ref_counted.h" #include "base/test/gmock_callback_support.h" #include "base/test/scoped_feature_list.h" @@ -16,13 +23,6 @@ #include "build/build_config.h" #include "chromeos/components/multidevice/logging/logging.h" #include "chromeos/components/multidevice/remote_device_test_util.h" -#include "chromeos/components/proximity_auth/fake_lock_handler.h" -#include "chromeos/components/proximity_auth/fake_remote_device_life_cycle.h" -#include "chromeos/components/proximity_auth/messenger.h" -#include "chromeos/components/proximity_auth/mock_proximity_auth_client.h" -#include "chromeos/components/proximity_auth/proximity_monitor.h" -#include "chromeos/components/proximity_auth/remote_device_life_cycle.h" -#include "chromeos/components/proximity_auth/remote_status_update.h" #include "chromeos/dbus/power/fake_power_manager_client.h" #include "chromeos/dbus/power/power_manager_client.h" #include "chromeos/dbus/power_manager/suspend.pb.h" diff --git a/ash/login/ui/lock_contents_view.cc b/ash/login/ui/lock_contents_view.cc index 910bee26e2bfa..70826b3f1a60b 100644 --- a/ash/login/ui/lock_contents_view.cc +++ b/ash/login/ui/lock_contents_view.cc @@ -10,6 +10,7 @@ #include #include "ash/accelerators/accelerator_controller_impl.h" +#include "ash/components/proximity_auth/public/mojom/auth_type.mojom.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/detachable_base/detachable_base_pairing_status.h" @@ -52,7 +53,6 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" -#include "chromeos/components/proximity_auth/public/mojom/auth_type.mojom.h" #include "chromeos/strings/grit/chromeos_strings.h" #include "chromeos/ui/vector_icons/vector_icons.h" #include "components/user_manager/known_user.h" diff --git a/ash/public/cpp/login_types.cc b/ash/public/cpp/login_types.cc index a3f4b68399458..f3762eba57f23 100644 --- a/ash/public/cpp/login_types.cc +++ b/ash/public/cpp/login_types.cc @@ -4,7 +4,7 @@ #include "ash/public/cpp/login_types.h" -#include "chromeos/components/proximity_auth/public/mojom/auth_type.mojom.h" +#include "ash/components/proximity_auth/public/mojom/auth_type.mojom.h" namespace ash { diff --git a/ash/public/cpp/login_types.h b/ash/public/cpp/login_types.h index 23bc29654f894..739a9dac9e504 100644 --- a/ash/public/cpp/login_types.h +++ b/ash/public/cpp/login_types.h @@ -5,13 +5,13 @@ #ifndef ASH_PUBLIC_CPP_LOGIN_TYPES_H_ #define ASH_PUBLIC_CPP_LOGIN_TYPES_H_ +#include "ash/components/proximity_auth/public/mojom/auth_type.mojom-forward.h" #include "ash/components/security_token_pin/constants.h" #include "ash/public/cpp/ash_public_export.h" #include "ash/public/cpp/session/user_info.h" #include "base/callback.h" #include "base/time/time.h" #include "base/token.h" -#include "chromeos/components/proximity_auth/public/mojom/auth_type.mojom-forward.h" #include "components/account_id/account_id.h" namespace ash { diff --git a/ash/public/mojom/BUILD.gn b/ash/public/mojom/BUILD.gn index 0316f022bac04..a27c2f5b44c4a 100644 --- a/ash/public/mojom/BUILD.gn +++ b/ash/public/mojom/BUILD.gn @@ -19,7 +19,7 @@ mojom("mojom") { ] public_deps = [ - "//chromeos/components/proximity_auth/public/mojom", + "//ash/components/proximity_auth/public/mojom", "//components/account_id/mojom", "//components/sync/mojom", "//mojo/public/mojom/base", diff --git a/chrome/browser/apps/platform_apps/api/BUILD.gn b/chrome/browser/apps/platform_apps/api/BUILD.gn index 324b4c4f54f2d..d0f483cd15ce0 100644 --- a/chrome/browser/apps/platform_apps/api/BUILD.gn +++ b/chrome/browser/apps/platform_apps/api/BUILD.gn @@ -77,9 +77,9 @@ source_set("api") { ] deps += [ + "//ash/components/proximity_auth", "//chrome:strings", "//chromeos/components/multidevice/logging", - "//chromeos/components/proximity_auth", "//components/account_id", "//components/strings:components_strings_grit", "//components/user_manager", diff --git a/chrome/browser/ash/login/easy_unlock/chrome_proximity_auth_client.h b/chrome/browser/ash/login/easy_unlock/chrome_proximity_auth_client.h index 5542cc489985b..739556cbcace9 100644 --- a/chrome/browser/ash/login/easy_unlock/chrome_proximity_auth_client.h +++ b/chrome/browser/ash/login/easy_unlock/chrome_proximity_auth_client.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_EASY_UNLOCK_CHROME_PROXIMITY_AUTH_CLIENT_H_ #define CHROME_BROWSER_ASH_LOGIN_EASY_UNLOCK_CHROME_PROXIMITY_AUTH_CLIENT_H_ -#include "chromeos/components/proximity_auth/proximity_auth_client.h" +#include "ash/components/proximity_auth/proximity_auth_client.h" class Profile; diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.cc index cc157f5f231e1..cb309d9c7501a 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "build/build_config.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "crypto/encryptor.h" #include "crypto/symmetric_key.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc index 4b044772f2298..d768a7fdbf59e 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc @@ -8,11 +8,11 @@ #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "base/command_line.h" #include "base/cxx17_backports.h" #include "build/build_config.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "testing/gtest/include/gtest/gtest.h" namespace ash { diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.cc index 3a6446d1ed31e..083993314269a 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/notifications/notification_display_service.h" @@ -12,7 +13,6 @@ #include "chrome/common/webui_url_constants.h" #include "chrome/grit/generated_resources.h" #include "chrome/grit/theme_resources.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/chromeos/devicetype_utils.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc index 1b6fb24faf005..b08655bdd63db 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc @@ -7,6 +7,10 @@ #include #include +#include "ash/components/proximity_auth/proximity_auth_local_state_pref_manager.h" +#include "ash/components/proximity_auth/proximity_auth_profile_pref_manager.h" +#include "ash/components/proximity_auth/proximity_auth_system.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "ash/constants/ash_features.h" #include "ash/public/cpp/smartlock_state.h" #include "base/bind.h" @@ -35,10 +39,6 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "chromeos/components/multidevice/logging/logging.h" -#include "chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.h" -#include "chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.h" -#include "chromeos/components/proximity_auth/proximity_auth_system.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power/power_manager_client.h" #include "chromeos/login/auth/user_context.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_service.h index 15af534a3119f..ec328052fd52b 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service.h @@ -9,6 +9,7 @@ #include #include +#include "ash/components/proximity_auth/smart_lock_metrics_recorder.h" #include "base/callback_forward.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" @@ -19,7 +20,6 @@ #include "chrome/browser/ash/login/easy_unlock/smartlock_feature_usage_metrics.h" #include "chrome/browser/ash/login/easy_unlock/smartlock_state_handler.h" #include "chromeos/components/multidevice/remote_device_ref.h" -#include "chromeos/components/proximity_auth/smart_lock_metrics_recorder.h" // TODO(https://crbug.com/1164001): move to forward declaration #include "chromeos/services/secure_channel/public/cpp/client/secure_channel_client.h" #include "components/keyed_service/core/keyed_service.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.cc index d13b3eaf2ef77..40d7579293251 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.cc @@ -10,6 +10,11 @@ #include #include "apps/app_lifetime_monitor_factory.h" +#include "ash/components/proximity_auth/proximity_auth_pref_names.h" +#include "ash/components/proximity_auth/proximity_auth_profile_pref_manager.h" +#include "ash/components/proximity_auth/proximity_auth_system.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" +#include "ash/components/proximity_auth/smart_lock_metrics_recorder.h" #include "base/base64url.h" #include "base/bind.h" #include "base/command_line.h" @@ -36,11 +41,6 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chromeos/components/multidevice/logging/logging.h" -#include "chromeos/components/proximity_auth/proximity_auth_pref_names.h" -#include "chromeos/components/proximity_auth/proximity_auth_profile_pref_manager.h" -#include "chromeos/components/proximity_auth/proximity_auth_system.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" -#include "chromeos/components/proximity_auth/smart_lock_metrics_recorder.h" #include "components/gcm_driver/gcm_profile_service.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h index d8c5dc5e14343..90b0cb2d26ffb 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h @@ -8,12 +8,12 @@ #include #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "base/callback.h" #include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_service.h" #include "chromeos/components/multidevice/remote_device_ref.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "chromeos/services/device_sync/proto/cryptauth_api.pb.h" #include "chromeos/services/device_sync/public/cpp/device_sync_client.h" #include "chromeos/services/multidevice_setup/public/cpp/multidevice_setup_client.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc index 93fde499257e2..60ed4ce3e90a4 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc @@ -11,6 +11,8 @@ #include #include +#include "ash/components/proximity_auth/fake_lock_handler.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/no_destructor.h" @@ -31,8 +33,6 @@ #include "chrome/test/base/testing_profile.h" #include "chromeos/components/multidevice/beacon_seed.h" #include "chromeos/components/multidevice/remote_device_test_util.h" -#include "chromeos/components/proximity_auth/fake_lock_handler.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power/power_manager_client.h" #include "chromeos/services/device_sync/proto/cryptauth_api.pb.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin.cc index d9a809f2be35f..621d74abaa0fd 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin.cc @@ -8,6 +8,8 @@ #include +#include "ash/components/proximity_auth/proximity_auth_local_state_pref_manager.h" +#include "ash/components/proximity_auth/smart_lock_metrics_recorder.h" #include "ash/public/cpp/smartlock_state.h" #include "base/base64url.h" #include "base/bind.h" @@ -32,8 +34,6 @@ #include "chromeos/components/multidevice/remote_device_cache.h" #include "chromeos/components/multidevice/remote_device_ref.h" #include "chromeos/components/multidevice/software_feature_state.h" -#include "chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.h" -#include "chromeos/components/proximity_auth/smart_lock_metrics_recorder.h" #include "chromeos/login/auth/user_context.h" #include "chromeos/login/login_state/login_state.h" #include "chromeos/tpm/tpm_token_loader.h" diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin.h index 56b875f6beab5..2c47d78b45d8d 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_signin.h @@ -9,6 +9,7 @@ #include #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/values.h" @@ -16,7 +17,6 @@ #include "chrome/browser/ash/login/easy_unlock/easy_unlock_types.h" // TODO(https://crbug.com/1164001): move to forward declaration #include "chromeos/components/multidevice/remote_device_cache.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" // TODO(https://crbug.com/1164001): move to forward declaration #include "chromeos/services/secure_channel/public/cpp/client/secure_channel_client.h" diff --git a/chrome/browser/ash/login/easy_unlock/smartlock_feature_usage_metrics.h b/chrome/browser/ash/login/easy_unlock/smartlock_feature_usage_metrics.h index 1ac82817616f5..bbbf78f8c6a3f 100644 --- a/chrome/browser/ash/login/easy_unlock/smartlock_feature_usage_metrics.h +++ b/chrome/browser/ash/login/easy_unlock/smartlock_feature_usage_metrics.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_EASY_UNLOCK_SMARTLOCK_FEATURE_USAGE_METRICS_H_ #define CHROME_BROWSER_ASH_LOGIN_EASY_UNLOCK_SMARTLOCK_FEATURE_USAGE_METRICS_H_ +#include "ash/components/proximity_auth/smart_lock_metrics_recorder.h" #include "chromeos/components/feature_usage/feature_usage_metrics.h" -#include "chromeos/components/proximity_auth/smart_lock_metrics_recorder.h" namespace ash { diff --git a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.cc b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.cc index 4ef099b352b9c..50cac945688c6 100644 --- a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.cc +++ b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.cc @@ -8,6 +8,7 @@ #include +#include "ash/components/proximity_auth/proximity_auth_pref_manager.h" #include "ash/constants/ash_features.h" #include "ash/public/cpp/smartlock_state.h" #include "base/bind.h" @@ -15,7 +16,6 @@ #include "build/build_config.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_metrics.h" #include "chrome/grit/generated_resources.h" -#include "chromeos/components/proximity_auth/proximity_auth_pref_manager.h" #include "ui/base/l10n/l10n_util.h" #include "ui/chromeos/devicetype_utils.h" diff --git a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.h b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.h index 502233a7da14b..38e0119d1763c 100644 --- a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.h +++ b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.h @@ -7,7 +7,7 @@ #include -#include "chromeos/components/proximity_auth/screenlock_bridge.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "components/account_id/account_id.h" namespace proximity_auth { diff --git a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler_unittest.cc b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler_unittest.cc index ef0269b399349..87a5170507534 100644 --- a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler_unittest.cc +++ b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler_unittest.cc @@ -10,6 +10,8 @@ #include #include +#include "ash/components/proximity_auth/proximity_auth_pref_manager.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "ash/public/cpp/smartlock_state.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -18,8 +20,6 @@ #include "chrome/browser/ash/login/easy_unlock/easy_unlock_metrics.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_service.h" #include "chrome/grit/generated_resources.h" -#include "chromeos/components/proximity_auth/proximity_auth_pref_manager.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ash/login/saml/in_session_password_sync_manager.cc b/chrome/browser/ash/login/saml/in_session_password_sync_manager.cc index dace2bd78a7e3..6a2cb023c83f3 100644 --- a/chrome/browser/ash/login/saml/in_session_password_sync_manager.cc +++ b/chrome/browser/ash/login/saml/in_session_password_sync_manager.cc @@ -6,6 +6,7 @@ #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "ash/constants/ash_switches.h" #include "base/command_line.h" #include "base/time/default_clock.h" @@ -18,7 +19,6 @@ #include "chrome/browser/ash/login/saml/password_sync_token_fetcher.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/ash/settings/cros_settings.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "chromeos/login/auth/extended_authenticator.h" #include "chromeos/login/auth/user_context.h" #include "components/prefs/pref_service.h" diff --git a/chrome/browser/ash/login/saml/in_session_password_sync_manager.h b/chrome/browser/ash/login/saml/in_session_password_sync_manager.h index 7cc9d27d62f34..c0cd50a53913c 100644 --- a/chrome/browser/ash/login/saml/in_session_password_sync_manager.h +++ b/chrome/browser/ash/login/saml/in_session_password_sync_manager.h @@ -8,11 +8,11 @@ #include #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "base/time/clock.h" #include "chrome/browser/ash/login/saml/password_sync_token_fetcher.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chromeos/in_session_password_change/lock_screen_reauth_dialogs.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "chromeos/login/auth/auth_status_consumer.h" // TODO(https://crbug.com/1164001): move to forward declaration. #include "chromeos/login/auth/cryptohome_authenticator.h" diff --git a/chrome/browser/ash/login/saml/mock_lock_handler.h b/chrome/browser/ash/login/saml/mock_lock_handler.h index b2cfa5186fe70..bda9fc15c6a32 100644 --- a/chrome/browser/ash/login/saml/mock_lock_handler.h +++ b/chrome/browser/ash/login/saml/mock_lock_handler.h @@ -7,7 +7,7 @@ #include -#include "chromeos/components/proximity_auth/screenlock_bridge.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "testing/gmock/include/gmock/gmock.h" namespace ash { diff --git a/chrome/browser/ash/login/screens/user_selection_screen.cc b/chrome/browser/ash/login/screens/user_selection_screen.cc index 2f3e6190bbd71..7a9bd622d3914 100644 --- a/chrome/browser/ash/login/screens/user_selection_screen.cc +++ b/chrome/browser/ash/login/screens/user_selection_screen.cc @@ -10,6 +10,8 @@ #include #include "ash/components/arc/arc_util.h" +#include "ash/components/proximity_auth/screenlock_bridge.h" +#include "ash/components/proximity_auth/smart_lock_metrics_recorder.h" #include "ash/components/settings/cros_settings_names.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" @@ -46,8 +48,6 @@ #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" -#include "chromeos/components/proximity_auth/smart_lock_metrics_recorder.h" #include "chromeos/cryptohome/cryptohome_parameters.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/tpm_manager/tpm_manager.pb.h" diff --git a/chrome/browser/ash/login/screens/user_selection_screen.h b/chrome/browser/ash/login/screens/user_selection_screen.h index 801e45569a205..aaa814221ad9d 100644 --- a/chrome/browser/ash/login/screens/user_selection_screen.h +++ b/chrome/browser/ash/login/screens/user_selection_screen.h @@ -9,6 +9,7 @@ #include #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "ash/public/cpp/session/user_info.h" #include "base/scoped_observation.h" #include "base/time/time.h" @@ -20,7 +21,6 @@ #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/components/proximity_auth/screenlock_bridge.h" #include "chromeos/dbus/cryptohome/rpc.pb.h" #include "components/account_id/account_id.h" #include "components/session_manager/core/session_manager_observer.h" diff --git a/chrome/browser/ash/login/signin/offline_signin_limiter.cc b/chrome/browser/ash/login/signin/offline_signin_limiter.cc index b24efdee2820c..2dffe63ec55f8 100644 --- a/chrome/browser/ash/login/signin/offline_signin_limiter.cc +++ b/chrome/browser/ash/login/signin/offline_signin_limiter.cc @@ -7,6 +7,7 @@ #include #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "ash/constants/ash_switches.h" #include "base/bind.h" #include "base/callback_helpers.h" @@ -23,7 +24,6 @@ #include "chrome/browser/ash/login/reauth_stats.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "components/prefs/pref_service.h" #include "components/session_manager/core/session_manager.h" #include "components/session_manager/core/session_manager_observer.h" diff --git a/chrome/browser/ash/login/ui/views/user_board_view.h b/chrome/browser/ash/login/ui/views/user_board_view.h index 09c4b1d3c27b2..c70065335337d 100644 --- a/chrome/browser/ash/login/ui/views/user_board_view.h +++ b/chrome/browser/ash/login/ui/views/user_board_view.h @@ -8,12 +8,12 @@ #include #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/ash/login/oobe_screen.h" // TODO(https://crbug.com/1164001): move to forward declaration #include "chrome/browser/ash/login/screens/user_selection_screen.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" class AccountId; diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index c2f0b12193d1d..b56b008d7b9a3 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -100,6 +100,7 @@ source_set("chromeos") { "//ash/components/phonehub/proto", "//ash/components/policy", "//ash/components/power", + "//ash/components/proximity_auth", "//ash/components/settings", "//ash/components/smbfs", "//ash/components/smbfs/mojom", @@ -206,7 +207,6 @@ source_set("chromeos") { "//chromeos/components/multidevice", "//chromeos/components/multidevice:stub_multidevice_util", "//chromeos/components/multidevice/logging", - "//chromeos/components/proximity_auth", "//chromeos/components/quick_answers", "//chromeos/components/quick_answers/public/cpp:cpp", "//chromeos/components/quick_answers/public/cpp:prefs", @@ -4692,6 +4692,8 @@ source_set("unit_tests") { "//ash/components/audio", "//ash/components/disks:test_support", "//ash/components/phonehub:test_support", + "//ash/components/proximity_auth", + "//ash/components/proximity_auth:test_support", "//ash/components/settings", "//ash/constants", "//ash/public/cpp", @@ -4714,8 +4716,6 @@ source_set("unit_tests") { "//chrome/test:test_support_unit", "//chromeos", "//chromeos/components/multidevice:test_support", - "//chromeos/components/proximity_auth", - "//chromeos/components/proximity_auth:test_support", "//chromeos/components/sensors:test_support", "//chromeos/components/tether:test_support", "//chromeos/dbus:test_support", diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index 984ec9503d27d..4e871ccc4aa2b 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -1116,6 +1116,7 @@ static_library("extensions") { "//ash/components/attestation", "//ash/components/disks", "//ash/components/enhanced_network_tts/mojom", + "//ash/components/proximity_auth", "//ash/components/settings", "//ash/constants", "//ash/keyboard/ui:resources_grit_grit", @@ -1129,7 +1130,6 @@ static_library("extensions") { "//chrome/browser/nearby_sharing/common", "//chrome/browser/ui/webui/settings/chromeos/constants:mojom", "//chromeos/components/chromebox_for_meetings/buildflags", - "//chromeos/components/proximity_auth", "//chromeos/components/quick_answers/public/cpp:prefs", "//chromeos/components/remote_apps/mojom", "//chromeos/cryptohome", diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index a4f965b9fdba5..ed12309e038c5 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -2892,6 +2892,7 @@ static_library("ui") { "//ash/components/pcie_peripheral", "//ash/components/phonehub", "//ash/components/phonehub:debug", + "//ash/components/proximity_auth", "//ash/components/settings", "//ash/constants", "//ash/keyboard/ui", @@ -2969,7 +2970,6 @@ static_library("ui") { "//chromeos/components/multidevice", "//chromeos/components/multidevice/debug_webui", "//chromeos/components/multidevice/logging", - "//chromeos/components/proximity_auth", "//chromeos/components/quick_answers", "//chromeos/components/quick_answers/public/cpp:cpp", "//chromeos/components/quick_answers/public/cpp:prefs", diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index 989d1bd300285..1a667453c804a 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -11,6 +11,7 @@ #include #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "ash/public/mojom/tray_action.mojom.h" #include "base/bind.h" #include "base/i18n/number_formatting.h" @@ -66,7 +67,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/login/auth/key.h" #include "chromeos/login/auth/user_context.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index 62291a7d6526a..d222d3ed436d3 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h @@ -10,6 +10,7 @@ #include #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" @@ -21,7 +22,6 @@ #include "chrome/browser/ui/webui/chromeos/login/base_webui_handler.h" #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "chromeos/network/portal_detector/network_portal_detector.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc index c3ec589008795..3d24f700d4639 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc @@ -6,6 +6,7 @@ #include +#include "ash/components/proximity_auth/screenlock_bridge.h" #include "base/compiler_specific.h" #include "base/cxx17_backports.h" #include "base/memory/ptr_util.h" @@ -17,7 +18,6 @@ #include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h" -#include "chromeos/components/proximity_auth/screenlock_bridge.h" #include "components/account_id/account_id.h" #include "components/user_manager/scoped_user_manager.h" #include "components/user_manager/user.h" diff --git a/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.cc b/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.cc index 2811d7231bc10..1ed1a1b19d4ba 100644 --- a/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.cc +++ b/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/multidevice_handler.h" #include "ash/components/phonehub/util/histogram_util.h" +#include "ash/components/proximity_auth/proximity_auth_pref_names.h" #include "ash/constants/ash_features.h" #include "base/bind.h" #include "base/callback_helpers.h" @@ -22,7 +23,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_dialog.h" #include "chromeos/components/multidevice/logging/logging.h" -#include "chromeos/components/proximity_auth/proximity_auth_pref_names.h" #include "chromeos/services/multidevice_setup/public/cpp/prefs.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/prefs/pref_service.h" diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 6d582fddda3c3..1c1b3ec0de86e 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -6297,6 +6297,8 @@ test("unit_tests") { "//ash/components/disks", "//ash/components/disks:test_support", "//ash/components/login/session", + "//ash/components/proximity_auth", + "//ash/components/proximity_auth:test_support", "//ash/public/cpp:test_support", "//ash/shortcut_viewer", "//ash/shortcut_viewer/strings:strings_grit", @@ -6320,8 +6322,6 @@ test("unit_tests") { "//chrome/services/sharing/public/cpp:unit_tests", "//chromeos/components/feature_usage:feature_usage", "//chromeos/components/multidevice:test_support", - "//chromeos/components/proximity_auth", - "//chromeos/components/proximity_auth:test_support", "//chromeos/components/sync_wifi", "//chromeos/cryptohome", "//chromeos/dbus", diff --git a/chromeos/components/BUILD.gn b/chromeos/components/BUILD.gn index aa932311d57b1..3d647b54c87cb 100644 --- a/chromeos/components/BUILD.gn +++ b/chromeos/components/BUILD.gn @@ -27,7 +27,6 @@ test("chromeos_components_unittests") { "//chromeos/components/local_search_service/public/mojom:unit_tests", "//chromeos/components/mojo_bootstrap:unit_tests", "//chromeos/components/multidevice:unit_tests", - "//chromeos/components/proximity_auth:unit_tests", "//chromeos/components/quick_answers:unit_tests", "//chromeos/components/sensors:unit_tests", "//chromeos/components/string_matching:unit_tests", diff --git a/chromeos/components/multidevice/debug_webui/BUILD.gn b/chromeos/components/multidevice/debug_webui/BUILD.gn index 80b5bd234afd6..2ef095226f57f 100644 --- a/chromeos/components/multidevice/debug_webui/BUILD.gn +++ b/chromeos/components/multidevice/debug_webui/BUILD.gn @@ -19,7 +19,6 @@ static_library("debug_webui") { "//base", "//base:i18n", "//chromeos/components/multidevice/logging", - "//chromeos/components/proximity_auth", "//chromeos/resources", "//chromeos/services/device_sync/proto", "//chromeos/services/device_sync/proto:util", diff --git a/chromeos/components/multidevice/debug_webui/proximity_auth_webui_handler.h b/chromeos/components/multidevice/debug_webui/proximity_auth_webui_handler.h index cf3c491fe133a..65f902bb77684 100644 --- a/chromeos/components/multidevice/debug_webui/proximity_auth_webui_handler.h +++ b/chromeos/components/multidevice/debug_webui/proximity_auth_webui_handler.h @@ -9,7 +9,6 @@ #include "base/values.h" #include "chromeos/components/multidevice/logging/log_buffer.h" #include "chromeos/components/multidevice/remote_device_ref.h" -#include "chromeos/components/proximity_auth/proximity_auth_client.h" #include "chromeos/services/device_sync/public/cpp/device_sync_client.h" #include "content/public/browser/web_ui_message_handler.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/chromeos/components/proximity_auth/DEPS b/chromeos/components/proximity_auth/DEPS deleted file mode 100644 index 7aafd83c345d5..0000000000000 --- a/chromeos/components/proximity_auth/DEPS +++ /dev/null @@ -1,17 +0,0 @@ -include_rules = [ - "+components/account_id/account_id.h", - "+components/prefs", - "+components/pref_registry/pref_registry_syncable.h", - "+components/sync_preferences/testing_pref_service_syncable.h", - "+device/bluetooth", - "+net", -] - -specific_include_rules = { - "screenlock_bridge\.*|unlock_manager\.*": [ - "+chromeos", - ], - "proximity_auth_client\.*|unlock_manager\.*": [ - "+ash/public/cpp", - ], -}