Move //{chromeos => ash}/components/proximity_auth

This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.

Change-Id: I396293a976a5182adfad5375f22e4fb109739789
Bug: 1164001
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3308311
Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Owners-Override: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Yeunjoo Choi <ychoi@igalia.com>
Cr-Commit-Position: refs/heads/main@{#949387}

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",

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': {

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.

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",

chromeos/components/proximity_auth/BUILD.gn → 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",

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",
+]

chromeos/components/proximity_auth/fake_lock_handler.cc → 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 {
 

chromeos/components/proximity_auth/fake_lock_handler.h → 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_

chromeos/components/proximity_auth/fake_remote_device_life_cycle.cc → 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 {
 

chromeos/components/proximity_auth/fake_remote_device_life_cycle.h → 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_

chromeos/components/proximity_auth/messenger.h → 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_

chromeos/components/proximity_auth/messenger_impl.cc → 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 <memory>
 #include <utility>
 
+#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 {
 

chromeos/components/proximity_auth/messenger_impl.h → 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 <memory>
 
+#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_

chromeos/components/proximity_auth/messenger_impl_unittest.cc → 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 <memory>
 
+#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"

chromeos/components/proximity_auth/messenger_observer.h → 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 <memory>
 #include <string>
@@ -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_

chromeos/components/proximity_auth/metrics.cc → 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 <stdint.h>
 

chromeos/components/proximity_auth/metrics.h → 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 <string>
 
@@ -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_

chromeos/components/proximity_auth/mock_proximity_auth_client.cc → 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"
 

chromeos/components/proximity_auth/mock_proximity_auth_client.h → 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 <string>
 
+#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_

chromeos/components/proximity_auth/proximity_auth_client.h → 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 <memory>
 #include <string>
 
+#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_

chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.cc → 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 <memory>
 #include <vector>
 
+#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"

chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager.h → 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_

chromeos/components/proximity_auth/proximity_auth_local_state_pref_manager_unittest.cc → 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 <memory>
 #include <string>
 #include <vector>
 
+#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"