Move //{ash => chromeos/ash}/services/multidevice_setup [2/2]
This CL moves remaing files to //ch/ash/services/multidevice_setup.
ChromeOS components and services are meant to live in chromeos/,
separate from Ash shell code. Fix a previous migration that used the
wrong directory.
This CL is part of the ChromeOS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Bug: 1164001
Change-Id: I9ee98d4756f4f3529f95ed5644f331331940cdf0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3963594
Owners-Override: Hidehiko Abe <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
Commit-Queue: Yeunjoo Choi <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1062166}
diff --git a/WATCHLISTS b/WATCHLISTS
index 49c471e..391da2a 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -1427,7 +1427,6 @@
'filepath': 'ash/multi_device_setup/'\
'|ash/resources/multidevice_resources.grdp'\
'|ash/services/device_sync/'\
- '|ash/services/multidevice_setup/'\
'|ash/services/secure_channel/'\
'|ash/webui/common/resources/multidevice_setup/'\
'|chrome/browser/ash/cryptauth/'\
diff --git a/ash/services/BUILD.gn b/ash/services/BUILD.gn
index ae7200c..3b00ac1 100644
--- a/ash/services/BUILD.gn
+++ b/ash/services/BUILD.gn
@@ -17,7 +17,6 @@
testonly = true
deps = [
"//ash/services/device_sync:unit_tests",
- "//ash/services/multidevice_setup:unit_tests",
"//ash/services/secure_channel:unit_tests",
]
}
diff --git a/ash/services/multidevice_setup/DEPS b/ash/services/multidevice_setup/DEPS
deleted file mode 100644
index 6fffcaa..0000000
--- a/ash/services/multidevice_setup/DEPS
+++ /dev/null
@@ -1,12 +0,0 @@
-# TODO(https://crbug.com/1164001): When this file is edited, same file in
-# //chromeos/ash/services/multidevice_setup should be updated as well. We need
-# to sync both files until the migration is done.
-include_rules = [
- "+ash/constants",
- "+ash/services/device_sync",
- "+chromeos/ash/components/multidevice",
- "+components/keyed_service/core",
- "+components/session_manager/core",
- "+components/sync_preferences/testing_pref_service_syncable.h",
- "+mojo/public/cpp/bindings",
-]
diff --git a/ash/services/multidevice_setup/DIR_METADATA b/ash/services/multidevice_setup/DIR_METADATA
deleted file mode 100644
index bf0812d..0000000
--- a/ash/services/multidevice_setup/DIR_METADATA
+++ /dev/null
@@ -1,7 +0,0 @@
-# TODO(https://crbug.com/1164001): When this file is edited, same file in
-# //chromeos/ash/services/multidevice_setup should be updated as well. We need
-# to sync both files until the migration is done.
-buganizer {
- component_id: 1108889
-}
-team_email: "[email protected] "
diff --git a/ash/services/multidevice_setup/OWNERS b/ash/services/multidevice_setup/OWNERS
deleted file mode 100644
index 5f152f8..0000000
--- a/ash/services/multidevice_setup/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file://chromeos/ash/services/multidevice_setup/OWNERS
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 43d1b63..006a1b8 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -5170,7 +5170,6 @@
"//ash/services/device_sync/public/cpp:prefs",
"//ash/services/device_sync/public/cpp:prefs",
"//ash/services/device_sync/public/mojom",
- "//ash/services/multidevice_setup",
"//ash/services/secure_channel/public/mojom",
"//ash/webui/camera_app_ui",
"//ash/webui/camera_app_ui:mojo_bindings",
@@ -5301,6 +5300,7 @@
"//chromeos/ash/services/cros_healthd/public/cpp",
"//chromeos/ash/services/cros_healthd/public/mojom",
"//chromeos/ash/services/hotspot_config/public/mojom",
+ "//chromeos/ash/services/multidevice_setup",
"//chromeos/ash/services/multidevice_setup/public/cpp",
"//chromeos/ash/services/multidevice_setup/public/cpp:first_run_field_trial",
"//chromeos/ash/services/multidevice_setup/public/cpp:prefs",
diff --git a/chrome/browser/ash/BUILD.gn b/chrome/browser/ash/BUILD.gn
index 90981b4..f9bae38 100644
--- a/chrome/browser/ash/BUILD.gn
+++ b/chrome/browser/ash/BUILD.gn
@@ -3389,7 +3389,6 @@
"//ash/resources/vector_icons",
"//ash/services/device_sync",
"//ash/services/device_sync:stub_device_sync",
- "//ash/services/multidevice_setup",
"//ash/services/secure_channel",
"//ash/services/secure_channel/public/cpp/shared",
"//ash/strings",
@@ -3523,6 +3522,7 @@
"//chromeos/ash/services/bluetooth_config:in_process_bluetooth_config",
"//chromeos/ash/services/cros_healthd/private/cpp",
"//chromeos/ash/services/ime:constants",
+ "//chromeos/ash/services/multidevice_setup",
"//chromeos/ash/services/multidevice_setup/public/cpp:oobe_completion_tracker",
"//chromeos/ash/services/multidevice_setup/public/cpp:prefs",
"//chromeos/ash/services/multidevice_setup/public/mojom",
diff --git a/chrome/browser/ash/multidevice_setup/multidevice_setup_client_factory.cc b/chrome/browser/ash/multidevice_setup/multidevice_setup_client_factory.cc
index 21af12e..47f5f6c 100644
--- a/chrome/browser/ash/multidevice_setup/multidevice_setup_client_factory.cc
+++ b/chrome/browser/ash/multidevice_setup/multidevice_setup_client_factory.cc
@@ -4,13 +4,13 @@
#include "chrome/browser/ash/multidevice_setup/multidevice_setup_client_factory.h"
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "chrome/browser/ash/device_sync/device_sync_client_factory.h"
#include "chrome/browser/ash/multidevice_setup/multidevice_setup_service_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/multidevice_setup_client.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/multidevice_setup_client_impl.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/prefs.h"
diff --git a/chrome/browser/ash/multidevice_setup/multidevice_setup_service_factory.cc b/chrome/browser/ash/multidevice_setup/multidevice_setup_service_factory.cc
index c03cdd1..f528d71 100644
--- a/chrome/browser/ash/multidevice_setup/multidevice_setup_service_factory.cc
+++ b/chrome/browser/ash/multidevice_setup/multidevice_setup_service_factory.cc
@@ -7,7 +7,6 @@
#include <memory>
#include <utility>
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
#include "base/no_destructor.h"
#include "chrome/browser/ash/android_sms/android_sms_app_manager.h"
#include "chrome/browser/ash/android_sms/android_sms_pairing_state_tracker_impl.h"
@@ -21,6 +20,7 @@
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/prefs.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/chrome_browser_interface_binders.cc b/chrome/browser/chrome_browser_interface_binders.cc
index 9c6adb7..c3793e8 100644
--- a/chrome/browser/chrome_browser_interface_binders.cc
+++ b/chrome/browser/chrome_browser_interface_binders.cc
@@ -211,7 +211,6 @@
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
#include "ash/webui/camera_app_ui/camera_app_helper.mojom.h"
#include "ash/webui/camera_app_ui/camera_app_ui.h"
#include "ash/webui/color_internals/color_internals_ui.h"
@@ -297,6 +296,7 @@
#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
#include "chromeos/ash/services/cellular_setup/public/mojom/cellular_setup.mojom.h"
#include "chromeos/ash/services/cellular_setup/public/mojom/esim_manager.mojom.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" // nogncheck
#include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom.h" // nogncheck
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index a74f13e4..23f32b1e 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -92,7 +92,6 @@
"//ash/services/device_sync",
"//ash/services/device_sync:stub_device_sync",
"//ash/services/device_sync/public/cpp",
- "//ash/services/multidevice_setup",
"//ash/services/secure_channel",
"//ash/services/secure_channel/public/cpp/client",
"//ash/services/secure_channel/public/mojom",
@@ -323,6 +322,7 @@
"//chromeos/ash/services/ime:constants",
"//chromeos/ash/services/ime/public/cpp:structs",
"//chromeos/ash/services/ime/public/mojom",
+ "//chromeos/ash/services/multidevice_setup",
"//chromeos/ash/services/multidevice_setup/public/cpp",
"//chromeos/ash/services/multidevice_setup/public/cpp:android_sms_app_helper_delegate",
"//chromeos/ash/services/multidevice_setup/public/cpp:android_sms_pairing_state_tracker",
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 563d4ddb..48b0f6c 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -300,7 +300,6 @@
#include "ash/constants/ash_pref_names.h"
#include "ash/public/cpp/ash_prefs.h"
#include "ash/services/device_sync/public/cpp/device_sync_prefs.h"
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
#include "chrome/browser/apps/app_preload_service/app_preload_service.h"
#include "chrome/browser/apps/app_service/metrics/app_platform_metrics_service.h"
#include "chrome/browser/apps/app_service/webapk/webapk_prefs.h"
@@ -412,6 +411,7 @@
#include "chromeos/ash/services/auth_factor_config/auth_factor_config.h"
#include "chromeos/ash/services/bluetooth_config/bluetooth_power_controller_impl.h"
#include "chromeos/ash/services/bluetooth_config/device_name_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "components/account_manager_core/chromeos/account_manager.h"
#include "components/onc/onc_pref_names.h"
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index ec99a06a..f7ad9173 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -3130,7 +3130,6 @@
"//ash/quick_pair/proto:fastpair_proto",
"//ash/quick_pair/repository",
"//ash/quick_pair/ui",
- "//ash/services/multidevice_setup",
"//ash/shortcut_viewer",
"//ash/shortcut_viewer/strings:strings_grit",
"//ash/webui/camera_app_ui",
@@ -3263,6 +3262,7 @@
"//chromeos/ash/services/bluetooth_config/public/mojom",
"//chromeos/ash/services/cellular_setup",
"//chromeos/ash/services/cellular_setup/public/mojom",
+ "//chromeos/ash/services/multidevice_setup",
"//chromeos/ash/services/multidevice_setup/public/cpp",
"//chromeos/ash/services/multidevice_setup/public/cpp:android_sms_app_helper_delegate",
"//chromeos/ash/services/multidevice_setup/public/cpp:prefs",
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 6ed6285..b74374c9 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -12,7 +12,6 @@
#include "ash/constants/ash_switches.h"
#include "ash/public/cpp/assistant/assistant_state.h"
#include "ash/public/cpp/new_window_delegate.h"
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
#include "base/bind.h"
#include "base/check.h"
#include "base/command_line.h"
@@ -56,6 +55,7 @@
#include "chrome/browser/web_applications/web_app_provider.h"
#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_switches.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
#include "components/ui_devtools/devtools_server.h"
#include "components/user_manager/user_manager.h"
#include "components/version_info/channel.h"
diff --git a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc
index 8e3e87e..e6784ae 100644
--- a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc
+++ b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc
@@ -8,7 +8,6 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_backdrop.h"
#include "ash/public/cpp/window_properties.h"
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/system/sys_info.h"
@@ -26,6 +25,7 @@
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/multidevice_setup_resources.h"
#include "chrome/grit/multidevice_setup_resources_map.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/url_provider.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 0f571f0..370c78f 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -177,7 +177,6 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/constants/ash_features.h"
#include "ash/constants/ash_switches.h"
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
#include "ash/webui/camera_app_ui/url_constants.h"
#include "ash/webui/color_internals/color_internals_ui.h"
#include "ash/webui/color_internals/url_constants.h"
@@ -288,6 +287,7 @@
#include "chrome/browser/ui/webui/nearby_internals/nearby_internals_ui.h"
#include "chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui.h"
#include "chrome/browser/ui/webui/settings/ash/os_settings_ui.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom.h" // nogncheck
#include "chromeos/services/network_health/public/mojom/network_health.mojom.h" // nogncheck
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index f8916c68..74cf3f9d 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -15,7 +15,6 @@
#include "ash/public/cpp/esim_manager.h"
#include "ash/public/cpp/network_config_service.h"
#include "ash/public/cpp/resources/grit/ash_public_unscaled_resources.h"
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
#include "ash/shell.h"
#include "base/bind.h"
#include "base/command_line.h"
@@ -126,6 +125,7 @@
#include "chrome/grit/oobe_unconditional_resources.h"
#include "chrome/grit/oobe_unconditional_resources_map.h"
#include "chromeos/ash/services/cellular_setup/public/mojom/esim_manager.mojom.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" // nogncheck
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "components/prefs/pref_service.h"
diff --git a/chromeos/ash/services/BUILD.gn b/chromeos/ash/services/BUILD.gn
index 36568e558..41a78f8 100644
--- a/chromeos/ash/services/BUILD.gn
+++ b/chromeos/ash/services/BUILD.gn
@@ -28,6 +28,7 @@
"//chromeos/ash/services/hotspot_config:unit_tests",
"//chromeos/ash/services/ime:services_unittests",
"//chromeos/ash/services/ime:unit_tests",
+ "//chromeos/ash/services/multidevice_setup:unit_tests",
"//chromeos/ash/services/nearby/public/cpp:unit_tests",
"//chromeos/ash/services/quick_pair:unit_tests",
"//chromeos/services/machine_learning/public/cpp:ash_unit_tests",
diff --git a/ash/services/multidevice_setup/BUILD.gn b/chromeos/ash/services/multidevice_setup/BUILD.gn
similarity index 100%
rename from ash/services/multidevice_setup/BUILD.gn
rename to chromeos/ash/services/multidevice_setup/BUILD.gn
diff --git a/chromeos/ash/services/multidevice_setup/DEPS b/chromeos/ash/services/multidevice_setup/DEPS
index 00dac87..9df1ec5 100644
--- a/chromeos/ash/services/multidevice_setup/DEPS
+++ b/chromeos/ash/services/multidevice_setup/DEPS
@@ -1,6 +1,3 @@
-# TODO(https://crbug.com/1164001): When this file is edited, same file in
-# //ash/services/multidevice_setup should be updated as well. We need
-# to sync both files until the migration is done.
include_rules = [
"+ash/constants",
"+ash/services/device_sync",
@@ -9,8 +6,4 @@
"+components/session_manager/core",
"+components/sync_preferences/testing_pref_service_syncable.h",
"+mojo/public/cpp/bindings",
-
- # TODO(https://crbug.com/1164001): This is a temporary deps during
- # //{ash=>chromeos/ash}/services/multidevice_setup migration.
- "+ash/services/multidevice_setup",
]
diff --git a/chromeos/ash/services/multidevice_setup/DIR_METADATA b/chromeos/ash/services/multidevice_setup/DIR_METADATA
index 3f0ba33..dd4c190 100644
--- a/chromeos/ash/services/multidevice_setup/DIR_METADATA
+++ b/chromeos/ash/services/multidevice_setup/DIR_METADATA
@@ -1,6 +1,3 @@
-# TODO(https://crbug.com/1164001): When this file is edited, same file in
-# //ash/services/multidevice_setup should be updated as well. We need
-# to sync both files until the migration is done.
buganizer {
component_id: 1108889
}
diff --git a/ash/services/multidevice_setup/account_status_change_delegate_notifier.cc b/chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier.cc
similarity index 92%
rename from ash/services/multidevice_setup/account_status_change_delegate_notifier.cc
rename to chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier.cc
index 1ef8b681..bd99299 100644
--- a/ash/services/multidevice_setup/account_status_change_delegate_notifier.cc
+++ b/chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier.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 "ash/services/multidevice_setup/account_status_change_delegate_notifier.h"
+#include "chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier.h"
#include "base/logging.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
diff --git a/ash/services/multidevice_setup/account_status_change_delegate_notifier.h b/chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier.h
similarity index 87%
rename from ash/services/multidevice_setup/account_status_change_delegate_notifier.h
rename to chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier.h
index 4b2014d..2473dcf 100644
--- a/ash/services/multidevice_setup/account_status_change_delegate_notifier.h
+++ b/chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier.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 ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
@@ -57,4 +57,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
diff --git a/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.cc b/chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.cc
similarity index 97%
rename from ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.cc
rename to chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.cc
index 4d78fa7..c666827 100644
--- a/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.cc
+++ b/chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.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 "ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h"
+#include "chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h"
#include <set>
#include <utility>
-#include "ash/services/multidevice_setup/host_device_timestamp_manager.h"
-#include "ash/services/multidevice_setup/host_status_provider_impl.h"
#include "base/memory/ptr_util.h"
#include "base/time/clock.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
+#include "chromeos/ash/services/multidevice_setup/host_device_timestamp_manager.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider_impl.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
diff --git a/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h b/chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h
similarity index 91%
rename from ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h
rename to chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h
index d974bb7..9dc0b46 100644
--- a/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h
+++ b/chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_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 ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_IMPL_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_IMPL_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_IMPL_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_IMPL_H_
#include <memory>
#include <string>
-#include "ash/services/multidevice_setup/account_status_change_delegate_notifier.h"
-#include "ash/services/multidevice_setup/host_status_provider.h"
+#include "chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/oobe_completion_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
@@ -136,4 +136,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_IMPL_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_IMPL_H_
diff --git a/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl_unittest.cc
similarity index 98%
rename from ash/services/multidevice_setup/account_status_change_delegate_notifier_impl_unittest.cc
rename to chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl_unittest.cc
index e393025..166c40b 100644
--- a/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_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 "ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h"
+#include "chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h"
#include <string>
#include <vector>
#include "ash/services/device_sync/public/cpp/fake_device_sync_client.h"
-#include "ash/services/multidevice_setup/fake_account_status_change_delegate.h"
-#include "ash/services/multidevice_setup/fake_host_device_timestamp_manager.h"
-#include "ash/services/multidevice_setup/fake_host_status_provider.h"
#include "base/test/simple_test_clock.h"
#include "base/test/task_environment.h"
#include "base/time/time.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
+#include "chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_device_timestamp_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_provider.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/oobe_completion_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
diff --git a/ash/services/multidevice_setup/android_sms_app_installing_status_observer.cc b/chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.cc
similarity index 97%
rename from ash/services/multidevice_setup/android_sms_app_installing_status_observer.cc
rename to chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.cc
index b612fda..b525557 100644
--- a/ash/services/multidevice_setup/android_sms_app_installing_status_observer.cc
+++ b/chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/services/multidevice_setup/android_sms_app_installing_status_observer.h"
+#include "chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.h"
-#include "ash/services/multidevice_setup/host_status_provider.h"
#include "base/memory/ptr_util.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/android_sms_app_helper_delegate.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "components/prefs/pref_registry_simple.h"
diff --git a/ash/services/multidevice_setup/android_sms_app_installing_status_observer.h b/chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.h
similarity index 85%
rename from ash/services/multidevice_setup/android_sms_app_installing_status_observer.h
rename to chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.h
index 026a067..42d0bf5 100644
--- a/ash/services/multidevice_setup/android_sms_app_installing_status_observer.h
+++ b/chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.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 ASH_SERVICES_MULTIDEVICE_SETUP_ANDROID_SMS_APP_INSTALLING_STATUS_OBSERVER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_ANDROID_SMS_APP_INSTALLING_STATUS_OBSERVER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ANDROID_SMS_APP_INSTALLING_STATUS_OBSERVER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ANDROID_SMS_APP_INSTALLING_STATUS_OBSERVER_H_
#include <memory>
-#include "ash/services/multidevice_setup/feature_state_manager.h"
-#include "ash/services/multidevice_setup/host_status_provider.h"
+#include "chromeos/ash/services/multidevice_setup/feature_state_manager.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
class PrefRegistrySimple;
class PrefService;
@@ -86,4 +86,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_ANDROID_SMS_APP_INSTALLING_STATUS_OBSERVER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ANDROID_SMS_APP_INSTALLING_STATUS_OBSERVER_H_
diff --git a/ash/services/multidevice_setup/android_sms_app_installing_status_observer_unittest.cc b/chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer_unittest.cc
similarity index 97%
rename from ash/services/multidevice_setup/android_sms_app_installing_status_observer_unittest.cc
rename to chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer_unittest.cc
index 5b95ec33..7c28969 100644
--- a/ash/services/multidevice_setup/android_sms_app_installing_status_observer_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/services/multidevice_setup/android_sms_app_installing_status_observer.h"
+#include "chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.h"
#include <string>
-#include "ash/services/multidevice_setup/fake_feature_state_manager.h"
-#include "ash/services/multidevice_setup/fake_host_status_provider.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
+#include "chromeos/ash/services/multidevice_setup/fake_feature_state_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_provider.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/fake_android_sms_app_helper_delegate.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
diff --git a/ash/services/multidevice_setup/device_with_connectivity_status.cc b/chromeos/ash/services/multidevice_setup/device_with_connectivity_status.cc
similarity index 91%
rename from ash/services/multidevice_setup/device_with_connectivity_status.cc
rename to chromeos/ash/services/multidevice_setup/device_with_connectivity_status.cc
index cbb6b96..c4dd5d7 100644
--- a/ash/services/multidevice_setup/device_with_connectivity_status.cc
+++ b/chromeos/ash/services/multidevice_setup/device_with_connectivity_status.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 "ash/services/multidevice_setup/device_with_connectivity_status.h"
+#include "chromeos/ash/services/multidevice_setup/device_with_connectivity_status.h"
#include "base/base64.h"
diff --git a/ash/services/multidevice_setup/device_with_connectivity_status.h b/chromeos/ash/services/multidevice_setup/device_with_connectivity_status.h
similarity index 82%
rename from ash/services/multidevice_setup/device_with_connectivity_status.h
rename to chromeos/ash/services/multidevice_setup/device_with_connectivity_status.h
index 10d10ce..56890b2 100644
--- a/ash/services/multidevice_setup/device_with_connectivity_status.h
+++ b/chromeos/ash/services/multidevice_setup/device_with_connectivity_status.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 ASH_SERVICES_MULTIDEVICE_SETUP_DEVICE_WITH_CONNECTIVITY_STATUS_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_DEVICE_WITH_CONNECTIVITY_STATUS_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_DEVICE_WITH_CONNECTIVITY_STATUS_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_DEVICE_WITH_CONNECTIVITY_STATUS_H_
#include <map>
#include <string>
@@ -40,4 +40,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_DEVICE_WITH_CONNECTIVITY_STATUS_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_DEVICE_WITH_CONNECTIVITY_STATUS_H_
diff --git a/ash/services/multidevice_setup/eligible_host_devices_provider.h b/chromeos/ash/services/multidevice_setup/eligible_host_devices_provider.h
similarity index 81%
rename from ash/services/multidevice_setup/eligible_host_devices_provider.h
rename to chromeos/ash/services/multidevice_setup/eligible_host_devices_provider.h
index 6c9a5057..3012140a 100644
--- a/ash/services/multidevice_setup/eligible_host_devices_provider.h
+++ b/chromeos/ash/services/multidevice_setup/eligible_host_devices_provider.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 ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
-#include "ash/services/multidevice_setup/device_with_connectivity_status.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
+#include "chromeos/ash/services/multidevice_setup/device_with_connectivity_status.h"
namespace ash {
@@ -43,4 +43,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
diff --git a/ash/services/multidevice_setup/eligible_host_devices_provider_impl.cc b/chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl.cc
similarity index 98%
rename from ash/services/multidevice_setup/eligible_host_devices_provider_impl.cc
rename to chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl.cc
index b225f4f..645a50c 100644
--- a/ash/services/multidevice_setup/eligible_host_devices_provider_impl.cc
+++ b/chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl.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 "ash/services/multidevice_setup/eligible_host_devices_provider_impl.h"
+#include "chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl.h"
#include "ash/constants/ash_features.h"
#include "base/feature_list.h"
diff --git a/ash/services/multidevice_setup/eligible_host_devices_provider_impl.h b/chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl.h
similarity index 86%
rename from ash/services/multidevice_setup/eligible_host_devices_provider_impl.h
rename to chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl.h
index b8da4bc..ad8f3f7 100644
--- a/ash/services/multidevice_setup/eligible_host_devices_provider_impl.h
+++ b/chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl.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 ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_IMPL_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_IMPL_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_IMPL_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_IMPL_H_
#include "ash/services/device_sync/public/cpp/device_sync_client.h"
-#include "ash/services/multidevice_setup/eligible_host_devices_provider.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
+#include "chromeos/ash/services/multidevice_setup/eligible_host_devices_provider.h"
namespace ash {
@@ -73,4 +73,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_IMPL_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_ELIGIBLE_HOST_DEVICES_PROVIDER_IMPL_H_
diff --git a/ash/services/multidevice_setup/eligible_host_devices_provider_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl_unittest.cc
similarity index 99%
rename from ash/services/multidevice_setup/eligible_host_devices_provider_impl_unittest.cc
rename to chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl_unittest.cc
index 92b4bc4..0e0c8b8 100644
--- a/ash/services/multidevice_setup/eligible_host_devices_provider_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl_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 "ash/services/multidevice_setup/eligible_host_devices_provider_impl.h"
+#include "chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl.h"
#include <memory>
diff --git a/ash/services/multidevice_setup/fake_account_status_change_delegate.cc b/chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.cc
similarity index 93%
rename from ash/services/multidevice_setup/fake_account_status_change_delegate.cc
rename to chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.cc
index 2102363..bdaabd5 100644
--- a/ash/services/multidevice_setup/fake_account_status_change_delegate.cc
+++ b/chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.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 "ash/services/multidevice_setup/fake_account_status_change_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/fake_account_status_change_delegate.h b/chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.h
similarity index 89%
rename from ash/services/multidevice_setup/fake_account_status_change_delegate.h
rename to chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.h
index b22db1ab..ab29869 100644
--- a/ash/services/multidevice_setup/fake_account_status_change_delegate.h
+++ b/chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_H_
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
@@ -71,4 +71,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_H_
diff --git a/ash/services/multidevice_setup/fake_account_status_change_delegate_notifier.h b/chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate_notifier.h
similarity index 68%
rename from ash/services/multidevice_setup/fake_account_status_change_delegate_notifier.h
rename to chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate_notifier.h
index 4f8a321..10eae66b 100644
--- a/ash/services/multidevice_setup/fake_account_status_change_delegate_notifier.h
+++ b/chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate_notifier.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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
-#include "ash/services/multidevice_setup/account_status_change_delegate_notifier.h"
+#include "chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier.h"
namespace ash {
@@ -31,4 +31,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ACCOUNT_STATUS_CHANGE_DELEGATE_NOTIFIER_H_
diff --git a/ash/services/multidevice_setup/fake_eligible_host_devices_provider.cc b/chromeos/ash/services/multidevice_setup/fake_eligible_host_devices_provider.cc
similarity index 88%
rename from ash/services/multidevice_setup/fake_eligible_host_devices_provider.cc
rename to chromeos/ash/services/multidevice_setup/fake_eligible_host_devices_provider.cc
index 8e4ddd0..4e4cd29 100644
--- a/ash/services/multidevice_setup/fake_eligible_host_devices_provider.cc
+++ b/chromeos/ash/services/multidevice_setup/fake_eligible_host_devices_provider.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 "ash/services/multidevice_setup/fake_eligible_host_devices_provider.h"
+#include "chromeos/ash/services/multidevice_setup/fake_eligible_host_devices_provider.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/fake_eligible_host_devices_provider.h b/chromeos/ash/services/multidevice_setup/fake_eligible_host_devices_provider.h
similarity index 80%
rename from ash/services/multidevice_setup/fake_eligible_host_devices_provider.h
rename to chromeos/ash/services/multidevice_setup/fake_eligible_host_devices_provider.h
index 53bfa31f..73f7a16 100644
--- a/ash/services/multidevice_setup/fake_eligible_host_devices_provider.h
+++ b/chromeos/ash/services/multidevice_setup/fake_eligible_host_devices_provider.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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
-#include "ash/services/multidevice_setup/eligible_host_devices_provider.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
+#include "chromeos/ash/services/multidevice_setup/eligible_host_devices_provider.h"
namespace ash {
@@ -49,4 +49,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_ELIGIBLE_HOST_DEVICES_PROVIDER_H_
diff --git a/ash/services/multidevice_setup/fake_feature_state_manager.cc b/chromeos/ash/services/multidevice_setup/fake_feature_state_manager.cc
similarity index 96%
rename from ash/services/multidevice_setup/fake_feature_state_manager.cc
rename to chromeos/ash/services/multidevice_setup/fake_feature_state_manager.cc
index 783ece9..07f8bae 100644
--- a/ash/services/multidevice_setup/fake_feature_state_manager.cc
+++ b/chromeos/ash/services/multidevice_setup/fake_feature_state_manager.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 "ash/services/multidevice_setup/fake_feature_state_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_feature_state_manager.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/fake_feature_state_manager.h b/chromeos/ash/services/multidevice_setup/fake_feature_state_manager.h
similarity index 86%
rename from ash/services/multidevice_setup/fake_feature_state_manager.h
rename to chromeos/ash/services/multidevice_setup/fake_feature_state_manager.h
index 844ac0c..3e67723 100644
--- a/ash/services/multidevice_setup/fake_feature_state_manager.h
+++ b/chromeos/ash/services/multidevice_setup/fake_feature_state_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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_MANAGER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_MANAGER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_MANAGER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_MANAGER_H_
-#include "ash/services/multidevice_setup/feature_state_manager.h"
+#include "chromeos/ash/services/multidevice_setup/feature_state_manager.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
namespace ash {
@@ -67,4 +67,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_MANAGER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_MANAGER_H_
diff --git a/ash/services/multidevice_setup/fake_feature_state_observer.cc b/chromeos/ash/services/multidevice_setup/fake_feature_state_observer.cc
similarity index 90%
rename from ash/services/multidevice_setup/fake_feature_state_observer.cc
rename to chromeos/ash/services/multidevice_setup/fake_feature_state_observer.cc
index a5f9bdc0..7e7f58cd 100644
--- a/ash/services/multidevice_setup/fake_feature_state_observer.cc
+++ b/chromeos/ash/services/multidevice_setup/fake_feature_state_observer.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 "ash/services/multidevice_setup/fake_feature_state_observer.h"
+#include "chromeos/ash/services/multidevice_setup/fake_feature_state_observer.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/fake_feature_state_observer.h b/chromeos/ash/services/multidevice_setup/fake_feature_state_observer.h
similarity index 85%
rename from ash/services/multidevice_setup/fake_feature_state_observer.h
rename to chromeos/ash/services/multidevice_setup/fake_feature_state_observer.h
index 7726dec..2d4be0a3 100644
--- a/ash/services/multidevice_setup/fake_feature_state_observer.h
+++ b/chromeos/ash/services/multidevice_setup/fake_feature_state_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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_OBSERVER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_OBSERVER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_OBSERVER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_OBSERVER_H_
#include "base/containers/flat_map.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
@@ -47,4 +47,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_OBSERVER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_FEATURE_STATE_OBSERVER_H_
diff --git a/ash/services/multidevice_setup/fake_global_state_feature_manager.cc b/chromeos/ash/services/multidevice_setup/fake_global_state_feature_manager.cc
similarity index 87%
rename from ash/services/multidevice_setup/fake_global_state_feature_manager.cc
rename to chromeos/ash/services/multidevice_setup/fake_global_state_feature_manager.cc
index c199e8f..5d52eb66 100644
--- a/ash/services/multidevice_setup/fake_global_state_feature_manager.cc
+++ b/chromeos/ash/services/multidevice_setup/fake_global_state_feature_manager.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 "ash/services/multidevice_setup/fake_global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_global_state_feature_manager.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/fake_global_state_feature_manager.h b/chromeos/ash/services/multidevice_setup/fake_global_state_feature_manager.h
similarity index 65%
rename from ash/services/multidevice_setup/fake_global_state_feature_manager.h
rename to chromeos/ash/services/multidevice_setup/fake_global_state_feature_manager.h
index 3605565..937482c 100644
--- a/ash/services/multidevice_setup/fake_global_state_feature_manager.h
+++ b/chromeos/ash/services/multidevice_setup/fake_global_state_feature_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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_GLOBAL_STATE_FEATURE_MANAGER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_GLOBAL_STATE_FEATURE_MANAGER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_GLOBAL_STATE_FEATURE_MANAGER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_GLOBAL_STATE_FEATURE_MANAGER_H_
-#include "ash/services/multidevice_setup/global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager.h"
namespace ash {
@@ -28,4 +28,4 @@
} // namespace multidevice_setup
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_GLOBAL_STATE_FEATURE_MANAGER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_GLOBAL_STATE_FEATURE_MANAGER_H_
diff --git a/ash/services/multidevice_setup/fake_host_backend_delegate.cc b/chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.cc
similarity index 96%
rename from ash/services/multidevice_setup/fake_host_backend_delegate.cc
rename to chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.cc
index 89a6c48..3346f68 100644
--- a/ash/services/multidevice_setup/fake_host_backend_delegate.cc
+++ b/chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.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 "ash/services/multidevice_setup/fake_host_backend_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.h"
#include "base/callback.h"
diff --git a/ash/services/multidevice_setup/fake_host_backend_delegate.h b/chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.h
similarity index 89%
rename from ash/services/multidevice_setup/fake_host_backend_delegate.h
rename to chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.h
index 57a81c213..ecca43ae 100644
--- a/ash/services/multidevice_setup/fake_host_backend_delegate.h
+++ b/chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_BACKEND_DELEGATE_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_BACKEND_DELEGATE_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_BACKEND_DELEGATE_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_BACKEND_DELEGATE_H_
-#include "ash/services/multidevice_setup/host_backend_delegate.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
namespace ash {
@@ -84,4 +84,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_BACKEND_DELEGATE_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_BACKEND_DELEGATE_H_
diff --git a/ash/services/multidevice_setup/fake_host_device_timestamp_manager.cc b/chromeos/ash/services/multidevice_setup/fake_host_device_timestamp_manager.cc
similarity index 93%
rename from ash/services/multidevice_setup/fake_host_device_timestamp_manager.cc
rename to chromeos/ash/services/multidevice_setup/fake_host_device_timestamp_manager.cc
index 722fbb9..08d4bf4 100644
--- a/ash/services/multidevice_setup/fake_host_device_timestamp_manager.cc
+++ b/chromeos/ash/services/multidevice_setup/fake_host_device_timestamp_manager.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 "ash/services/multidevice_setup/fake_host_device_timestamp_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_device_timestamp_manager.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/fake_host_device_timestamp_manager.h b/chromeos/ash/services/multidevice_setup/fake_host_device_timestamp_manager.h
similarity index 76%
rename from ash/services/multidevice_setup/fake_host_device_timestamp_manager.h
rename to chromeos/ash/services/multidevice_setup/fake_host_device_timestamp_manager.h
index c71fccc6..ff8b4e07 100644
--- a/ash/services/multidevice_setup/fake_host_device_timestamp_manager.h
+++ b/chromeos/ash/services/multidevice_setup/fake_host_device_timestamp_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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_DEVICE_TIMESTAMP_MANAGER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_DEVICE_TIMESTAMP_MANAGER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_DEVICE_TIMESTAMP_MANAGER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_DEVICE_TIMESTAMP_MANAGER_H_
-#include "ash/services/multidevice_setup/host_device_timestamp_manager.h"
#include "base/time/time.h"
+#include "chromeos/ash/services/multidevice_setup/host_device_timestamp_manager.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
namespace ash {
@@ -38,4 +38,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_DEVICE_TIMESTAMP_MANAGER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_DEVICE_TIMESTAMP_MANAGER_H_
diff --git a/ash/services/multidevice_setup/fake_host_status_observer.cc b/chromeos/ash/services/multidevice_setup/fake_host_status_observer.cc
similarity index 91%
rename from ash/services/multidevice_setup/fake_host_status_observer.cc
rename to chromeos/ash/services/multidevice_setup/fake_host_status_observer.cc
index 37ef7ba..cb8e132 100644
--- a/ash/services/multidevice_setup/fake_host_status_observer.cc
+++ b/chromeos/ash/services/multidevice_setup/fake_host_status_observer.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 "ash/services/multidevice_setup/fake_host_status_observer.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_observer.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/fake_host_status_observer.h b/chromeos/ash/services/multidevice_setup/fake_host_status_observer.h
similarity index 85%
rename from ash/services/multidevice_setup/fake_host_status_observer.h
rename to chromeos/ash/services/multidevice_setup/fake_host_status_observer.h
index 398b83e1..aff4852 100644
--- a/ash/services/multidevice_setup/fake_host_status_observer.h
+++ b/chromeos/ash/services/multidevice_setup/fake_host_status_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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_OBSERVER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_OBSERVER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_OBSERVER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_OBSERVER_H_
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
@@ -49,4 +49,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_OBSERVER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_OBSERVER_H_
diff --git a/ash/services/multidevice_setup/fake_host_status_provider.cc b/chromeos/ash/services/multidevice_setup/fake_host_status_provider.cc
similarity index 93%
rename from ash/services/multidevice_setup/fake_host_status_provider.cc
rename to chromeos/ash/services/multidevice_setup/fake_host_status_provider.cc
index aac5414..d71244f 100644
--- a/ash/services/multidevice_setup/fake_host_status_provider.cc
+++ b/chromeos/ash/services/multidevice_setup/fake_host_status_provider.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 "ash/services/multidevice_setup/fake_host_status_provider.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_provider.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/fake_host_status_provider.h b/chromeos/ash/services/multidevice_setup/fake_host_status_provider.h
similarity index 85%
rename from ash/services/multidevice_setup/fake_host_status_provider.h
rename to chromeos/ash/services/multidevice_setup/fake_host_status_provider.h
index a97965b..56763597 100644
--- a/ash/services/multidevice_setup/fake_host_status_provider.h
+++ b/chromeos/ash/services/multidevice_setup/fake_host_status_provider.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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_PROVIDER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_PROVIDER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_PROVIDER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_PROVIDER_H_
#include <vector>
-#include "ash/services/multidevice_setup/host_status_provider.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
namespace ash {
@@ -64,4 +64,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_PROVIDER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_STATUS_PROVIDER_H_
diff --git a/ash/services/multidevice_setup/fake_host_verifier.cc b/chromeos/ash/services/multidevice_setup/fake_host_verifier.cc
similarity index 90%
rename from ash/services/multidevice_setup/fake_host_verifier.cc
rename to chromeos/ash/services/multidevice_setup/fake_host_verifier.cc
index b12c695a..495b0864 100644
--- a/ash/services/multidevice_setup/fake_host_verifier.cc
+++ b/chromeos/ash/services/multidevice_setup/fake_host_verifier.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 "ash/services/multidevice_setup/fake_host_verifier.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_verifier.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/fake_host_verifier.h b/chromeos/ash/services/multidevice_setup/fake_host_verifier.h
similarity index 83%
rename from ash/services/multidevice_setup/fake_host_verifier.h
rename to chromeos/ash/services/multidevice_setup/fake_host_verifier.h
index 2026d53..3e1003f6 100644
--- a/ash/services/multidevice_setup/fake_host_verifier.h
+++ b/chromeos/ash/services/multidevice_setup/fake_host_verifier.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 ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_VERIFIER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_VERIFIER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_VERIFIER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_VERIFIER_H_
-#include "ash/services/multidevice_setup/host_verifier.h"
+#include "chromeos/ash/services/multidevice_setup/host_verifier.h"
namespace ash {
@@ -61,4 +61,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_VERIFIER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FAKE_HOST_VERIFIER_H_
diff --git a/ash/services/multidevice_setup/feature_state_manager.cc b/chromeos/ash/services/multidevice_setup/feature_state_manager.cc
similarity index 95%
rename from ash/services/multidevice_setup/feature_state_manager.cc
rename to chromeos/ash/services/multidevice_setup/feature_state_manager.cc
index 5e5833b..c579be49 100644
--- a/ash/services/multidevice_setup/feature_state_manager.cc
+++ b/chromeos/ash/services/multidevice_setup/feature_state_manager.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 "ash/services/multidevice_setup/feature_state_manager.h"
+#include "chromeos/ash/services/multidevice_setup/feature_state_manager.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
diff --git a/ash/services/multidevice_setup/feature_state_manager.h b/chromeos/ash/services/multidevice_setup/feature_state_manager.h
similarity index 90%
rename from ash/services/multidevice_setup/feature_state_manager.h
rename to chromeos/ash/services/multidevice_setup/feature_state_manager.h
index 467c098..91bcb56 100644
--- a/ash/services/multidevice_setup/feature_state_manager.h
+++ b/chromeos/ash/services/multidevice_setup/feature_state_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 ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_H_
#include <ostream>
@@ -68,4 +68,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_H_
diff --git a/ash/services/multidevice_setup/feature_state_manager_impl.cc b/chromeos/ash/services/multidevice_setup/feature_state_manager_impl.cc
similarity index 99%
rename from ash/services/multidevice_setup/feature_state_manager_impl.cc
rename to chromeos/ash/services/multidevice_setup/feature_state_manager_impl.cc
index ea0e60e2..c38fa94 100644
--- a/ash/services/multidevice_setup/feature_state_manager_impl.cc
+++ b/chromeos/ash/services/multidevice_setup/feature_state_manager_impl.cc
@@ -2,12 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/services/multidevice_setup/feature_state_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/feature_state_manager_impl.h"
#include <array>
#include "ash/constants/ash_features.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager.h"
#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
@@ -18,6 +17,7 @@
#include "chromeos/ash/components/multidevice/logging/logging.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
#include "chromeos/ash/components/multidevice/software_feature.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/prefs.h"
#include "components/prefs/pref_service.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/ash/services/multidevice_setup/feature_state_manager_impl.h b/chromeos/ash/services/multidevice_setup/feature_state_manager_impl.h
similarity index 92%
rename from ash/services/multidevice_setup/feature_state_manager_impl.h
rename to chromeos/ash/services/multidevice_setup/feature_state_manager_impl.h
index 532b8462..3e7b9d64 100644
--- a/ash/services/multidevice_setup/feature_state_manager_impl.h
+++ b/chromeos/ash/services/multidevice_setup/feature_state_manager_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 ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_IMPL_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_IMPL_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_IMPL_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_IMPL_H_
#include "ash/services/device_sync/public/cpp/device_sync_client.h"
-#include "ash/services/multidevice_setup/feature_state_manager.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager.h"
-#include "ash/services/multidevice_setup/host_status_provider.h"
#include "base/containers/flat_map.h"
#include "base/timer/timer.h"
+#include "chromeos/ash/services/multidevice_setup/feature_state_manager.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/android_sms_pairing_state_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "components/prefs/pref_change_registrar.h"
@@ -139,4 +139,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_IMPL_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_FEATURE_STATE_MANAGER_IMPL_H_
diff --git a/ash/services/multidevice_setup/feature_state_manager_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/feature_state_manager_impl_unittest.cc
similarity index 99%
rename from ash/services/multidevice_setup/feature_state_manager_impl_unittest.cc
rename to chromeos/ash/services/multidevice_setup/feature_state_manager_impl_unittest.cc
index 2c8eb8c..a6c493d 100644
--- a/ash/services/multidevice_setup/feature_state_manager_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/feature_state_manager_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 "ash/services/multidevice_setup/feature_state_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/feature_state_manager_impl.h"
#include <memory>
#include <vector>
#include "ash/constants/ash_features.h"
#include "ash/services/device_sync/public/cpp/fake_device_sync_client.h"
-#include "ash/services/multidevice_setup/fake_feature_state_manager.h"
-#include "ash/services/multidevice_setup/fake_global_state_feature_manager.h"
-#include "ash/services/multidevice_setup/fake_host_status_provider.h"
#include "base/containers/contains.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
+#include "chromeos/ash/services/multidevice_setup/fake_feature_state_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_provider.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/fake_android_sms_pairing_state_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/prefs.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
diff --git a/ash/services/multidevice_setup/global_state_feature_manager.h b/chromeos/ash/services/multidevice_setup/global_state_feature_manager.h
similarity index 84%
rename from ash/services/multidevice_setup/global_state_feature_manager.h
rename to chromeos/ash/services/multidevice_setup/global_state_feature_manager.h
index 2e301f9..8ad141d 100644
--- a/ash/services/multidevice_setup/global_state_feature_manager.h
+++ b/chromeos/ash/services/multidevice_setup/global_state_feature_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 ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_H_
namespace ash {
@@ -37,4 +37,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_H_
diff --git a/ash/services/multidevice_setup/global_state_feature_manager_impl.cc b/chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.cc
similarity index 97%
rename from ash/services/multidevice_setup/global_state_feature_manager_impl.cc
rename to chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.cc
index 62505b3f..605c584 100644
--- a/ash/services/multidevice_setup/global_state_feature_manager_impl.cc
+++ b/chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.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 "ash/services/multidevice_setup/global_state_feature_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.h"
#include <memory>
#include <sstream>
@@ -13,8 +13,6 @@
#include "ash/services/device_sync/feature_status_change.h"
#include "ash/services/device_sync/public/cpp/device_sync_client.h"
#include "ash/services/device_sync/public/mojom/device_sync.mojom.h"
-#include "ash/services/multidevice_setup/host_status_provider.h"
-#include "ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include "base/bind.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
@@ -26,8 +24,10 @@
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
#include "chromeos/ash/components/multidevice/software_feature.h"
#include "chromeos/ash/components/multidevice/software_feature_state.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/prefs.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
+#include "chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
diff --git a/ash/services/multidevice_setup/global_state_feature_manager_impl.h b/chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.h
similarity index 92%
rename from ash/services/multidevice_setup/global_state_feature_manager_impl.h
rename to chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.h
index aa99074e..6d00536d 100644
--- a/ash/services/multidevice_setup/global_state_feature_manager_impl.h
+++ b/chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.h
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_IMPL_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_IMPL_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_IMPL_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_IMPL_H_
#include <memory>
#include <string>
#include "ash/services/device_sync/public/cpp/device_sync_client.h"
#include "ash/services/device_sync/public/mojom/device_sync.mojom.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager.h"
-#include "ash/services/multidevice_setup/host_status_provider.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
class PrefRegistrySimple;
@@ -163,4 +163,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_IMPL_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_GLOBAL_STATE_FEATURE_MANAGER_IMPL_H_
diff --git a/ash/services/multidevice_setup/global_state_feature_manager_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl_unittest.cc
similarity index 98%
rename from ash/services/multidevice_setup/global_state_feature_manager_impl_unittest.cc
rename to chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl_unittest.cc
index 7e4a986..86f5a7d8 100644
--- a/ash/services/multidevice_setup/global_state_feature_manager_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl_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 "ash/services/multidevice_setup/global_state_feature_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.h"
#include <memory>
#include <utility>
@@ -10,9 +10,6 @@
#include "ash/constants/ash_features.h"
#include "ash/services/device_sync/public/cpp/fake_device_sync_client.h"
-#include "ash/services/multidevice_setup/fake_host_status_provider.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager.h"
-#include "ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
#include "base/timer/mock_timer.h"
@@ -20,8 +17,11 @@
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
#include "chromeos/ash/components/multidevice/software_feature.h"
#include "chromeos/ash/components/multidevice/software_feature_state.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_provider.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/prefs.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
+#include "chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.cc b/chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.cc
similarity index 98%
rename from ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.cc
rename to chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.cc
index 0b857fb..77583335 100644
--- a/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.cc
+++ b/chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.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 "ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h"
+#include "chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h"
#include "ash/constants/ash_features.h"
#include "ash/services/device_sync/public/cpp/device_sync_client.h"
diff --git a/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h b/chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h
similarity index 90%
rename from ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h
rename to chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h
index 6ae481f..01a58a7 100644
--- a/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h
+++ b/chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.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 ASH_SERVICES_MULTIDEVICE_SETUP_GRANDFATHERED_EASY_UNLOCK_HOST_DISABLER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_GRANDFATHERED_EASY_UNLOCK_HOST_DISABLER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_GRANDFATHERED_EASY_UNLOCK_HOST_DISABLER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_GRANDFATHERED_EASY_UNLOCK_HOST_DISABLER_H_
#include <memory>
#include "ash/services/device_sync/public/mojom/device_sync.mojom.h"
-#include "ash/services/multidevice_setup/host_backend_delegate.h"
#include "base/memory/weak_ptr.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate.h"
class PrefRegistrySimple;
class PrefService;
@@ -107,4 +107,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_GRANDFATHERED_EASY_UNLOCK_HOST_DISABLER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_GRANDFATHERED_EASY_UNLOCK_HOST_DISABLER_H_
diff --git a/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler_unittest.cc b/chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler_unittest.cc
similarity index 98%
rename from ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler_unittest.cc
rename to chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler_unittest.cc
index 8172f25..909a8077 100644
--- a/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler_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 "ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h"
+#include "chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h"
#include <memory>
#include "ash/constants/ash_features.h"
#include "ash/services/device_sync/public/cpp/fake_device_sync_client.h"
-#include "ash/services/multidevice_setup/fake_host_backend_delegate.h"
#include "base/timer/mock_timer.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/services/multidevice_setup/host_backend_delegate.cc b/chromeos/ash/services/multidevice_setup/host_backend_delegate.cc
similarity index 92%
rename from ash/services/multidevice_setup/host_backend_delegate.cc
rename to chromeos/ash/services/multidevice_setup/host_backend_delegate.cc
index 456d110..ac1424d 100644
--- a/ash/services/multidevice_setup/host_backend_delegate.cc
+++ b/chromeos/ash/services/multidevice_setup/host_backend_delegate.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 "ash/services/multidevice_setup/host_backend_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/host_backend_delegate.h b/chromeos/ash/services/multidevice_setup/host_backend_delegate.h
similarity index 94%
rename from ash/services/multidevice_setup/host_backend_delegate.h
rename to chromeos/ash/services/multidevice_setup/host_backend_delegate.h
index be730172..bc7afff 100644
--- a/ash/services/multidevice_setup/host_backend_delegate.h
+++ b/chromeos/ash/services/multidevice_setup/host_backend_delegate.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 ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_H_
#include "base/observer_list.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
@@ -98,4 +98,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_H_
diff --git a/ash/services/multidevice_setup/host_backend_delegate_impl.cc b/chromeos/ash/services/multidevice_setup/host_backend_delegate_impl.cc
similarity index 98%
rename from ash/services/multidevice_setup/host_backend_delegate_impl.cc
rename to chromeos/ash/services/multidevice_setup/host_backend_delegate_impl.cc
index 1b9b4be8..82bc6b4b 100644
--- a/ash/services/multidevice_setup/host_backend_delegate_impl.cc
+++ b/chromeos/ash/services/multidevice_setup/host_backend_delegate_impl.cc
@@ -2,13 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/services/multidevice_setup/host_backend_delegate_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate_impl.h"
#include <sstream>
#include "ash/constants/ash_features.h"
#include "ash/services/device_sync/feature_status_change.h"
-#include "ash/services/multidevice_setup/eligible_host_devices_provider.h"
#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/memory/ptr_util.h"
@@ -16,6 +15,7 @@
#include "chromeos/ash/components/multidevice/logging/logging.h"
#include "chromeos/ash/components/multidevice/software_feature.h"
#include "chromeos/ash/components/multidevice/software_feature_state.h"
+#include "chromeos/ash/services/multidevice_setup/eligible_host_devices_provider.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
diff --git a/ash/services/multidevice_setup/host_backend_delegate_impl.h b/chromeos/ash/services/multidevice_setup/host_backend_delegate_impl.h
similarity index 92%
rename from ash/services/multidevice_setup/host_backend_delegate_impl.h
rename to chromeos/ash/services/multidevice_setup/host_backend_delegate_impl.h
index 1456c568..e0b815d 100644
--- a/ash/services/multidevice_setup/host_backend_delegate_impl.h
+++ b/chromeos/ash/services/multidevice_setup/host_backend_delegate_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 ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_IMPL_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_IMPL_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_IMPL_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_IMPL_H_
#include "ash/services/device_sync/public/cpp/device_sync_client.h"
-#include "ash/services/multidevice_setup/host_backend_delegate.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
class PrefRegistrySimple;
@@ -110,4 +110,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_IMPL_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_BACKEND_DELEGATE_IMPL_H_
diff --git a/ash/services/multidevice_setup/host_backend_delegate_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/host_backend_delegate_impl_unittest.cc
similarity index 98%
rename from ash/services/multidevice_setup/host_backend_delegate_impl_unittest.cc
rename to chromeos/ash/services/multidevice_setup/host_backend_delegate_impl_unittest.cc
index a2f4b8d..3d59ff5 100644
--- a/ash/services/multidevice_setup/host_backend_delegate_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/host_backend_delegate_impl_unittest.cc
@@ -2,14 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/services/multidevice_setup/host_backend_delegate_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate_impl.h"
#include <memory>
#include "ash/constants/ash_features.h"
#include "ash/services/device_sync/public/cpp/fake_device_sync_client.h"
-#include "ash/services/multidevice_setup/fake_eligible_host_devices_provider.h"
-#include "ash/services/multidevice_setup/fake_host_backend_delegate.h"
#include "base/containers/flat_map.h"
#include "base/test/scoped_feature_list.h"
#include "base/timer/mock_timer.h"
@@ -17,6 +15,8 @@
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
#include "chromeos/ash/components/multidevice/software_feature.h"
#include "chromeos/ash/components/multidevice/software_feature_state.h"
+#include "chromeos/ash/services/multidevice_setup/fake_eligible_host_devices_provider.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/ash/services/multidevice_setup/host_device_timestamp_manager.h b/chromeos/ash/services/multidevice_setup/host_device_timestamp_manager.h
similarity index 86%
rename from ash/services/multidevice_setup/host_device_timestamp_manager.h
rename to chromeos/ash/services/multidevice_setup/host_device_timestamp_manager.h
index 017095b..00c3e9b 100644
--- a/ash/services/multidevice_setup/host_device_timestamp_manager.h
+++ b/chromeos/ash/services/multidevice_setup/host_device_timestamp_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 ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_H_
#include "base/time/time.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
@@ -46,4 +46,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_H_
diff --git a/ash/services/multidevice_setup/host_device_timestamp_manager_impl.cc b/chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl.cc
similarity index 98%
rename from ash/services/multidevice_setup/host_device_timestamp_manager_impl.cc
rename to chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl.cc
index fb5e4219..fb4c6a2 100644
--- a/ash/services/multidevice_setup/host_device_timestamp_manager_impl.cc
+++ b/chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl.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 "ash/services/multidevice_setup/host_device_timestamp_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl.h"
#include "base/memory/ptr_util.h"
#include "base/time/clock.h"
diff --git a/ash/services/multidevice_setup/host_device_timestamp_manager_impl.h b/chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl.h
similarity index 84%
rename from ash/services/multidevice_setup/host_device_timestamp_manager_impl.h
rename to chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl.h
index 609bf1e..a25c7671 100644
--- a/ash/services/multidevice_setup/host_device_timestamp_manager_impl.h
+++ b/chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_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 ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_IMPL_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_IMPL_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_IMPL_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_IMPL_H_
#include <memory>
-#include "ash/services/multidevice_setup/host_device_timestamp_manager.h"
-#include "ash/services/multidevice_setup/host_status_provider.h"
#include "base/time/time.h"
+#include "chromeos/ash/services/multidevice_setup/host_device_timestamp_manager.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
class PrefRegistrySimple;
@@ -82,4 +82,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_IMPL_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_DEVICE_TIMESTAMP_MANAGER_IMPL_H_
diff --git a/ash/services/multidevice_setup/host_device_timestamp_manager_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl_unittest.cc
similarity index 96%
rename from ash/services/multidevice_setup/host_device_timestamp_manager_impl_unittest.cc
rename to chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl_unittest.cc
index c9789987..ba54521 100644
--- a/ash/services/multidevice_setup/host_device_timestamp_manager_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl_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 "ash/services/multidevice_setup/host_device_timestamp_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl.h"
#include <memory>
-#include "ash/services/multidevice_setup/fake_host_status_provider.h"
#include "base/test/simple_test_clock.h"
#include "base/time/time.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_provider.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/services/multidevice_setup/host_status_provider.cc b/chromeos/ash/services/multidevice_setup/host_status_provider.cc
similarity index 97%
rename from ash/services/multidevice_setup/host_status_provider.cc
rename to chromeos/ash/services/multidevice_setup/host_status_provider.cc
index 71ccc64e..471c1a5 100644
--- a/ash/services/multidevice_setup/host_status_provider.cc
+++ b/chromeos/ash/services/multidevice_setup/host_status_provider.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 "ash/services/multidevice_setup/host_status_provider.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
#include "base/logging.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
diff --git a/ash/services/multidevice_setup/host_status_provider.h b/chromeos/ash/services/multidevice_setup/host_status_provider.h
similarity index 90%
rename from ash/services/multidevice_setup/host_status_provider.h
rename to chromeos/ash/services/multidevice_setup/host_status_provider.h
index 3eb1dc2..96b862e 100644
--- a/ash/services/multidevice_setup/host_status_provider.h
+++ b/chromeos/ash/services/multidevice_setup/host_status_provider.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 ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_H_
#include "base/observer_list.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
@@ -75,4 +75,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_H_
diff --git a/ash/services/multidevice_setup/host_status_provider_impl.cc b/chromeos/ash/services/multidevice_setup/host_status_provider_impl.cc
similarity index 97%
rename from ash/services/multidevice_setup/host_status_provider_impl.cc
rename to chromeos/ash/services/multidevice_setup/host_status_provider_impl.cc
index b2b3dec..7ebd31d 100644
--- a/ash/services/multidevice_setup/host_status_provider_impl.cc
+++ b/chromeos/ash/services/multidevice_setup/host_status_provider_impl.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 "ash/services/multidevice_setup/host_status_provider_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider_impl.h"
#include <algorithm>
-#include "ash/services/multidevice_setup/eligible_host_devices_provider.h"
#include "base/bind.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
#include "base/time/time.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
+#include "chromeos/ash/services/multidevice_setup/eligible_host_devices_provider.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/host_status_provider_impl.h b/chromeos/ash/services/multidevice_setup/host_status_provider_impl.h
similarity index 87%
rename from ash/services/multidevice_setup/host_status_provider_impl.h
rename to chromeos/ash/services/multidevice_setup/host_status_provider_impl.h
index 6dbb80c..8fcf91a 100644
--- a/ash/services/multidevice_setup/host_status_provider_impl.h
+++ b/chromeos/ash/services/multidevice_setup/host_status_provider_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 ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_IMPL_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_IMPL_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_IMPL_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_IMPL_H_
#include "ash/services/device_sync/public/cpp/device_sync_client.h"
-#include "ash/services/multidevice_setup/host_backend_delegate.h"
-#include "ash/services/multidevice_setup/host_status_provider.h"
-#include "ash/services/multidevice_setup/host_verifier.h"
#include "base/timer/timer.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
+#include "chromeos/ash/services/multidevice_setup/host_verifier.h"
namespace ash {
@@ -93,4 +93,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_IMPL_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_STATUS_PROVIDER_IMPL_H_
diff --git a/ash/services/multidevice_setup/host_status_provider_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/host_status_provider_impl_unittest.cc
similarity index 94%
rename from ash/services/multidevice_setup/host_status_provider_impl_unittest.cc
rename to chromeos/ash/services/multidevice_setup/host_status_provider_impl_unittest.cc
index b274280..9aedf6c5 100644
--- a/ash/services/multidevice_setup/host_status_provider_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/host_status_provider_impl_unittest.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/services/multidevice_setup/host_status_provider_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider_impl.h"
#include <memory>
#include "ash/services/device_sync/public/cpp/fake_device_sync_client.h"
-#include "ash/services/multidevice_setup/fake_eligible_host_devices_provider.h"
-#include "ash/services/multidevice_setup/fake_host_backend_delegate.h"
-#include "ash/services/multidevice_setup/fake_host_status_provider.h"
-#include "ash/services/multidevice_setup/fake_host_verifier.h"
#include "base/test/task_environment.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
+#include "chromeos/ash/services/multidevice_setup/fake_eligible_host_devices_provider.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_provider.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_verifier.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/services/multidevice_setup/host_verifier.cc b/chromeos/ash/services/multidevice_setup/host_verifier.cc
similarity index 93%
rename from ash/services/multidevice_setup/host_verifier.cc
rename to chromeos/ash/services/multidevice_setup/host_verifier.cc
index 9be948c..c13dad3 100644
--- a/ash/services/multidevice_setup/host_verifier.cc
+++ b/chromeos/ash/services/multidevice_setup/host_verifier.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 "ash/services/multidevice_setup/host_verifier.h"
+#include "chromeos/ash/services/multidevice_setup/host_verifier.h"
#include "base/logging.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
diff --git a/ash/services/multidevice_setup/host_verifier.h b/chromeos/ash/services/multidevice_setup/host_verifier.h
similarity index 90%
rename from ash/services/multidevice_setup/host_verifier.h
rename to chromeos/ash/services/multidevice_setup/host_verifier.h
index e5f0e29..a79ce0b 100644
--- a/ash/services/multidevice_setup/host_verifier.h
+++ b/chromeos/ash/services/multidevice_setup/host_verifier.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 ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_H_
#include "base/observer_list.h"
@@ -63,4 +63,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_H_
diff --git a/ash/services/multidevice_setup/host_verifier_impl.cc b/chromeos/ash/services/multidevice_setup/host_verifier_impl.cc
similarity index 99%
rename from ash/services/multidevice_setup/host_verifier_impl.cc
rename to chromeos/ash/services/multidevice_setup/host_verifier_impl.cc
index 891a9a82..ec784ef 100644
--- a/ash/services/multidevice_setup/host_verifier_impl.cc
+++ b/chromeos/ash/services/multidevice_setup/host_verifier_impl.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 "ash/services/multidevice_setup/host_verifier_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_verifier_impl.h"
#include <utility>
diff --git a/ash/services/multidevice_setup/host_verifier_impl.h b/chromeos/ash/services/multidevice_setup/host_verifier_impl.h
similarity index 91%
rename from ash/services/multidevice_setup/host_verifier_impl.h
rename to chromeos/ash/services/multidevice_setup/host_verifier_impl.h
index 0575c84..44a9d52 100644
--- a/ash/services/multidevice_setup/host_verifier_impl.h
+++ b/chromeos/ash/services/multidevice_setup/host_verifier_impl.h
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_IMPL_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_IMPL_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_IMPL_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_IMPL_H_
#include <memory>
#include "ash/services/device_sync/public/cpp/device_sync_client.h"
-#include "ash/services/multidevice_setup/host_backend_delegate.h"
-#include "ash/services/multidevice_setup/host_verifier.h"
#include "base/memory/weak_ptr.h"
#include "base/time/default_clock.h"
#include "base/timer/timer.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/host_verifier.h"
class PrefRegistrySimple;
class PrefService;
@@ -112,4 +112,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_IMPL_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_HOST_VERIFIER_IMPL_H_
diff --git a/ash/services/multidevice_setup/host_verifier_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/host_verifier_impl_unittest.cc
similarity index 98%
rename from ash/services/multidevice_setup/host_verifier_impl_unittest.cc
rename to chromeos/ash/services/multidevice_setup/host_verifier_impl_unittest.cc
index 61e0a935..75f993f9 100644
--- a/ash/services/multidevice_setup/host_verifier_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/host_verifier_impl_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 "ash/services/multidevice_setup/host_verifier_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_verifier_impl.h"
#include <memory>
#include <string>
@@ -11,14 +11,14 @@
#include "ash/constants/ash_features.h"
#include "ash/services/device_sync/proto/cryptauth_common.pb.h"
#include "ash/services/device_sync/public/cpp/fake_device_sync_client.h"
-#include "ash/services/multidevice_setup/fake_host_backend_delegate.h"
-#include "ash/services/multidevice_setup/fake_host_verifier.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/simple_test_clock.h"
#include "base/timer/mock_timer.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
#include "chromeos/ash/components/multidevice/software_feature.h"
#include "chromeos/ash/components/multidevice/software_feature_state.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_verifier.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/services/multidevice_setup/multidevice_setup_base.cc b/chromeos/ash/services/multidevice_setup/multidevice_setup_base.cc
similarity index 88%
rename from ash/services/multidevice_setup/multidevice_setup_base.cc
rename to chromeos/ash/services/multidevice_setup/multidevice_setup_base.cc
index 27e1e4a6..10e7e86 100644
--- a/ash/services/multidevice_setup/multidevice_setup_base.cc
+++ b/chromeos/ash/services/multidevice_setup/multidevice_setup_base.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 "ash/services/multidevice_setup/multidevice_setup_base.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_base.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/multidevice_setup_base.h b/chromeos/ash/services/multidevice_setup/multidevice_setup_base.h
similarity index 85%
rename from ash/services/multidevice_setup/multidevice_setup_base.h
rename to chromeos/ash/services/multidevice_setup/multidevice_setup_base.h
index 6920d093..5957b3f 100644
--- a/ash/services/multidevice_setup/multidevice_setup_base.h
+++ b/chromeos/ash/services/multidevice_setup/multidevice_setup_base.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 ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_BASE_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_BASE_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_BASE_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_BASE_H_
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -43,4 +43,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_BASE_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_BASE_H_
diff --git a/ash/services/multidevice_setup/multidevice_setup_impl.cc b/chromeos/ash/services/multidevice_setup/multidevice_setup_impl.cc
similarity index 93%
rename from ash/services/multidevice_setup/multidevice_setup_impl.cc
rename to chromeos/ash/services/multidevice_setup/multidevice_setup_impl.cc
index edf3dfe..a523189 100644
--- a/ash/services/multidevice_setup/multidevice_setup_impl.cc
+++ b/chromeos/ash/services/multidevice_setup/multidevice_setup_impl.cc
@@ -5,21 +5,9 @@
#include <utility>
#include <vector>
-#include "ash/services/multidevice_setup/multidevice_setup_impl.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_impl.h"
#include "ash/constants/ash_features.h"
-#include "ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h"
-#include "ash/services/multidevice_setup/android_sms_app_installing_status_observer.h"
-#include "ash/services/multidevice_setup/eligible_host_devices_provider_impl.h"
-#include "ash/services/multidevice_setup/feature_state_manager_impl.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager_impl.h"
-#include "ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h"
-#include "ash/services/multidevice_setup/host_backend_delegate_impl.h"
-#include "ash/services/multidevice_setup/host_device_timestamp_manager_impl.h"
-#include "ash/services/multidevice_setup/host_status_provider_impl.h"
-#include "ash/services/multidevice_setup/host_verifier_impl.h"
-#include "ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include "base/containers/contains.h"
#include "base/containers/flat_set.h"
#include "base/memory/ptr_util.h"
@@ -28,11 +16,23 @@
#include "base/ranges/algorithm.h"
#include "base/time/default_clock.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
+#include "chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h"
+#include "chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.h"
+#include "chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl.h"
+#include "chromeos/ash/services/multidevice_setup/feature_state_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_verifier_impl.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/android_sms_app_helper_delegate.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/android_sms_pairing_state_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/auth_token_validator.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/oobe_completion_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
+#include "chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/multidevice_setup_impl.h b/chromeos/ash/services/multidevice_setup/multidevice_setup_impl.h
similarity index 91%
rename from ash/services/multidevice_setup/multidevice_setup_impl.h
rename to chromeos/ash/services/multidevice_setup/multidevice_setup_impl.h
index 48817c1..1434322 100644
--- a/ash/services/multidevice_setup/multidevice_setup_impl.h
+++ b/chromeos/ash/services/multidevice_setup/multidevice_setup_impl.h
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_IMPL_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_IMPL_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_IMPL_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_IMPL_H_
#include <memory>
#include <string>
-#include "ash/services/multidevice_setup/feature_state_manager.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager.h"
-#include "ash/services/multidevice_setup/host_status_provider.h"
-#include "ash/services/multidevice_setup/multidevice_setup_base.h"
-#include "ash/services/multidevice_setup/wifi_sync_notification_controller.h"
+#include "chromeos/ash/services/multidevice_setup/feature_state_manager.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_base.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
+#include "chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote_set.h"
#include "url/gurl.h"
@@ -166,4 +166,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_IMPL_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_IMPL_H_
diff --git a/ash/services/multidevice_setup/multidevice_setup_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/multidevice_setup_impl_unittest.cc
similarity index 96%
rename from ash/services/multidevice_setup/multidevice_setup_impl_unittest.cc
rename to chromeos/ash/services/multidevice_setup/multidevice_setup_impl_unittest.cc
index c7b142c..5c2e7286 100644
--- a/ash/services/multidevice_setup/multidevice_setup_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/multidevice_setup_impl_unittest.cc
@@ -9,41 +9,41 @@
#include "ash/constants/ash_features.h"
#include "ash/services/device_sync/public/cpp/fake_device_sync_client.h"
#include "ash/services/device_sync/public/cpp/fake_gcm_device_info_provider.h"
-#include "ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h"
-#include "ash/services/multidevice_setup/android_sms_app_installing_status_observer.h"
-#include "ash/services/multidevice_setup/eligible_host_devices_provider_impl.h"
-#include "ash/services/multidevice_setup/fake_account_status_change_delegate.h"
-#include "ash/services/multidevice_setup/fake_account_status_change_delegate_notifier.h"
-#include "ash/services/multidevice_setup/fake_eligible_host_devices_provider.h"
-#include "ash/services/multidevice_setup/fake_feature_state_manager.h"
-#include "ash/services/multidevice_setup/fake_feature_state_observer.h"
-#include "ash/services/multidevice_setup/fake_global_state_feature_manager.h"
-#include "ash/services/multidevice_setup/fake_host_backend_delegate.h"
-#include "ash/services/multidevice_setup/fake_host_device_timestamp_manager.h"
-#include "ash/services/multidevice_setup/fake_host_status_observer.h"
-#include "ash/services/multidevice_setup/fake_host_status_provider.h"
-#include "ash/services/multidevice_setup/fake_host_verifier.h"
-#include "ash/services/multidevice_setup/feature_state_manager_impl.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager_impl.h"
-#include "ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h"
-#include "ash/services/multidevice_setup/host_backend_delegate_impl.h"
-#include "ash/services/multidevice_setup/host_device_timestamp_manager_impl.h"
-#include "ash/services/multidevice_setup/host_status_provider_impl.h"
-#include "ash/services/multidevice_setup/host_verifier_impl.h"
-#include "ash/services/multidevice_setup/multidevice_setup_impl.h"
-#include "ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include "base/bind.h"
#include "base/containers/flat_map.h"
#include "base/run_loop.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
+#include "chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h"
+#include "chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.h"
+#include "chromeos/ash/services/multidevice_setup/eligible_host_devices_provider_impl.h"
+#include "chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate_notifier.h"
+#include "chromeos/ash/services/multidevice_setup/fake_eligible_host_devices_provider.h"
+#include "chromeos/ash/services/multidevice_setup/fake_feature_state_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_feature_state_observer.h"
+#include "chromeos/ash/services/multidevice_setup/fake_global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_backend_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_device_timestamp_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_observer.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_provider.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_verifier.h"
+#include "chromeos/ash/services/multidevice_setup/feature_state_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_verifier_impl.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_impl.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/fake_android_sms_app_helper_delegate.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/fake_android_sms_pairing_state_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/fake_auth_token_validator.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/oobe_completion_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
+#include "chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/services/multidevice_setup/multidevice_setup_initializer.cc b/chromeos/ash/services/multidevice_setup/multidevice_setup_initializer.cc
similarity index 98%
rename from ash/services/multidevice_setup/multidevice_setup_initializer.cc
rename to chromeos/ash/services/multidevice_setup/multidevice_setup_initializer.cc
index 969fcee..ce04c1a 100644
--- a/ash/services/multidevice_setup/multidevice_setup_initializer.cc
+++ b/chromeos/ash/services/multidevice_setup/multidevice_setup_initializer.cc
@@ -4,12 +4,12 @@
#include <utility>
-#include "ash/services/multidevice_setup/multidevice_setup_initializer.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_initializer.h"
-#include "ash/services/multidevice_setup/multidevice_setup_impl.h"
#include "base/check.h"
#include "base/memory/ptr_util.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_impl.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/android_sms_app_helper_delegate.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/android_sms_pairing_state_tracker.h"
diff --git a/ash/services/multidevice_setup/multidevice_setup_initializer.h b/chromeos/ash/services/multidevice_setup/multidevice_setup_initializer.h
similarity index 95%
rename from ash/services/multidevice_setup/multidevice_setup_initializer.h
rename to chromeos/ash/services/multidevice_setup/multidevice_setup_initializer.h
index 285e3419..b830fd7 100644
--- a/ash/services/multidevice_setup/multidevice_setup_initializer.h
+++ b/chromeos/ash/services/multidevice_setup/multidevice_setup_initializer.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 ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_INITIALIZER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_INITIALIZER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_INITIALIZER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_INITIALIZER_H_
#include <tuple>
#include <utility>
#include <vector>
#include "ash/services/device_sync/public/cpp/device_sync_client.h"
-#include "ash/services/multidevice_setup/multidevice_setup_base.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_base.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
@@ -182,4 +182,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_INITIALIZER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_INITIALIZER_H_
diff --git a/ash/services/multidevice_setup/multidevice_setup_service.cc b/chromeos/ash/services/multidevice_setup/multidevice_setup_service.cc
similarity index 73%
rename from ash/services/multidevice_setup/multidevice_setup_service.cc
rename to chromeos/ash/services/multidevice_setup/multidevice_setup_service.cc
index 599f43c..ff1855b 100644
--- a/ash/services/multidevice_setup/multidevice_setup_service.cc
+++ b/chromeos/ash/services/multidevice_setup/multidevice_setup_service.cc
@@ -2,24 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
-#include "ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h"
-#include "ash/services/multidevice_setup/android_sms_app_installing_status_observer.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager_impl.h"
-#include "ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h"
-#include "ash/services/multidevice_setup/host_backend_delegate_impl.h"
-#include "ash/services/multidevice_setup/host_device_timestamp_manager_impl.h"
-#include "ash/services/multidevice_setup/host_verifier_impl.h"
-#include "ash/services/multidevice_setup/multidevice_setup_base.h"
-#include "ash/services/multidevice_setup/multidevice_setup_initializer.h"
-#include "ash/services/multidevice_setup/privileged_host_device_setter_impl.h"
-#include "ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include "base/bind.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
+#include "chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier_impl.h"
+#include "chromeos/ash/services/multidevice_setup/android_sms_app_installing_status_observer.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/grandfathered_easy_unlock_host_disabler.h"
+#include "chromeos/ash/services/multidevice_setup/host_backend_delegate_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_device_timestamp_manager_impl.h"
+#include "chromeos/ash/services/multidevice_setup/host_verifier_impl.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_base.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_initializer.h"
+#include "chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/android_sms_app_helper_delegate.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/android_sms_pairing_state_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/prefs.h"
+#include "chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/multidevice_setup_service.h b/chromeos/ash/services/multidevice_setup/multidevice_setup_service.h
similarity index 90%
rename from ash/services/multidevice_setup/multidevice_setup_service.h
rename to chromeos/ash/services/multidevice_setup/multidevice_setup_service.h
index 9eff797..105d6aad 100644
--- a/ash/services/multidevice_setup/multidevice_setup_service.h
+++ b/chromeos/ash/services/multidevice_setup/multidevice_setup_service.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_SERVICE_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_SERVICE_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_SERVICE_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_SERVICE_H_
#include <memory>
@@ -70,4 +70,4 @@
using ::ash::multidevice_setup::MultiDeviceSetupService;
}
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_SERVICE_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_SERVICE_H_
diff --git a/ash/services/multidevice_setup/multidevice_setup_service_unittest.cc b/chromeos/ash/services/multidevice_setup/multidevice_setup_service_unittest.cc
similarity index 97%
rename from ash/services/multidevice_setup/multidevice_setup_service_unittest.cc
rename to chromeos/ash/services/multidevice_setup/multidevice_setup_service_unittest.cc
index 79a225b..46b7a7c8 100644
--- a/ash/services/multidevice_setup/multidevice_setup_service_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/multidevice_setup_service_unittest.cc
@@ -6,16 +6,16 @@
#include "ash/services/device_sync/public/cpp/fake_device_sync_client.h"
#include "ash/services/device_sync/public/cpp/fake_gcm_device_info_provider.h"
-#include "ash/services/multidevice_setup/fake_account_status_change_delegate.h"
-#include "ash/services/multidevice_setup/fake_feature_state_observer.h"
-#include "ash/services/multidevice_setup/fake_host_status_observer.h"
-#include "ash/services/multidevice_setup/multidevice_setup_impl.h"
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
+#include "chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/fake_feature_state_observer.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_observer.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_impl.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/fake_android_sms_app_helper_delegate.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/fake_android_sms_pairing_state_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/fake_auth_token_validator.h"
diff --git a/ash/services/multidevice_setup/privileged_host_device_setter_base.cc b/chromeos/ash/services/multidevice_setup/privileged_host_device_setter_base.cc
similarity index 86%
rename from ash/services/multidevice_setup/privileged_host_device_setter_base.cc
rename to chromeos/ash/services/multidevice_setup/privileged_host_device_setter_base.cc
index eed46f2..5036a6d 100644
--- a/ash/services/multidevice_setup/privileged_host_device_setter_base.cc
+++ b/chromeos/ash/services/multidevice_setup/privileged_host_device_setter_base.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 "ash/services/multidevice_setup/privileged_host_device_setter_base.h"
+#include "chromeos/ash/services/multidevice_setup/privileged_host_device_setter_base.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/privileged_host_device_setter_base.h b/chromeos/ash/services/multidevice_setup/privileged_host_device_setter_base.h
similarity index 80%
rename from ash/services/multidevice_setup/privileged_host_device_setter_base.h
rename to chromeos/ash/services/multidevice_setup/privileged_host_device_setter_base.h
index c2c2b015..75e0eda 100644
--- a/ash/services/multidevice_setup/privileged_host_device_setter_base.h
+++ b/chromeos/ash/services/multidevice_setup/privileged_host_device_setter_base.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 ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_BASE_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_BASE_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_BASE_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_BASE_H_
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -39,4 +39,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_BASE_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_BASE_H_
diff --git a/ash/services/multidevice_setup/privileged_host_device_setter_impl.cc b/chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl.cc
similarity index 90%
rename from ash/services/multidevice_setup/privileged_host_device_setter_impl.cc
rename to chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl.cc
index 7fd1f71..8165214 100644
--- a/ash/services/multidevice_setup/privileged_host_device_setter_impl.cc
+++ b/chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/services/multidevice_setup/privileged_host_device_setter_impl.h"
+#include "chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl.h"
-#include "ash/services/multidevice_setup/multidevice_setup_base.h"
#include "base/memory/ptr_util.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_base.h"
namespace ash {
diff --git a/ash/services/multidevice_setup/privileged_host_device_setter_impl.h b/chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl.h
similarity index 81%
rename from ash/services/multidevice_setup/privileged_host_device_setter_impl.h
rename to chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl.h
index a3ce0b9f..383179a 100644
--- a/ash/services/multidevice_setup/privileged_host_device_setter_impl.h
+++ b/chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl.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 ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_IMPL_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_IMPL_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_IMPL_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_IMPL_H_
-#include "ash/services/multidevice_setup/privileged_host_device_setter_base.h"
+#include "chromeos/ash/services/multidevice_setup/privileged_host_device_setter_base.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
namespace ash {
@@ -55,4 +55,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_IMPL_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_PRIVILEGED_HOST_DEVICE_SETTER_IMPL_H_
diff --git a/ash/services/multidevice_setup/privileged_host_device_setter_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl_unittest.cc
similarity index 96%
rename from ash/services/multidevice_setup/privileged_host_device_setter_impl_unittest.cc
rename to chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl_unittest.cc
index 400edf2..2a425e34 100644
--- a/ash/services/multidevice_setup/privileged_host_device_setter_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl_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 "ash/services/multidevice_setup/privileged_host_device_setter_impl.h"
+#include "chromeos/ash/services/multidevice_setup/privileged_host_device_setter_impl.h"
#include <memory>
diff --git a/chromeos/ash/services/multidevice_setup/public/cpp/BUILD.gn b/chromeos/ash/services/multidevice_setup/public/cpp/BUILD.gn
index dcb3966..fb9cfc26 100644
--- a/chromeos/ash/services/multidevice_setup/public/cpp/BUILD.gn
+++ b/chromeos/ash/services/multidevice_setup/public/cpp/BUILD.gn
@@ -119,7 +119,7 @@
":android_sms_pairing_state_tracker",
":auth_token_validator",
":cpp",
- "//ash/services/multidevice_setup",
+ "//chromeos/ash/services/multidevice_setup",
"//chromeos/ash/services/multidevice_setup/public/mojom",
"//url",
]
@@ -135,12 +135,12 @@
deps = [
":cpp",
":test_support",
- "//ash/services/multidevice_setup",
- "//ash/services/multidevice_setup:test_support",
"//base",
"//base/test:test_support",
"//chromeos/ash/components/multidevice",
"//chromeos/ash/components/multidevice:test_support",
+ "//chromeos/ash/services/multidevice_setup",
+ "//chromeos/ash/services/multidevice_setup:test_support",
"//chromeos/ash/services/multidevice_setup/public/mojom",
"//testing/gtest",
]
diff --git a/chromeos/ash/services/multidevice_setup/public/cpp/fake_multidevice_setup.h b/chromeos/ash/services/multidevice_setup/public/cpp/fake_multidevice_setup.h
index 0cabf7f..6b89f09 100644
--- a/chromeos/ash/services/multidevice_setup/public/cpp/fake_multidevice_setup.h
+++ b/chromeos/ash/services/multidevice_setup/public/cpp/fake_multidevice_setup.h
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "ash/services/multidevice_setup/multidevice_setup_base.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_base.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
diff --git a/chromeos/ash/services/multidevice_setup/public/cpp/fake_privileged_host_device_setter.h b/chromeos/ash/services/multidevice_setup/public/cpp/fake_privileged_host_device_setter.h
index fd17b13e..26a1ed8 100644
--- a/chromeos/ash/services/multidevice_setup/public/cpp/fake_privileged_host_device_setter.h
+++ b/chromeos/ash/services/multidevice_setup/public/cpp/fake_privileged_host_device_setter.h
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-#include "ash/services/multidevice_setup/privileged_host_device_setter_base.h"
+#include "chromeos/ash/services/multidevice_setup/privileged_host_device_setter_base.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
namespace ash {
diff --git a/chromeos/ash/services/multidevice_setup/public/cpp/multidevice_setup_client_impl_unittest.cc b/chromeos/ash/services/multidevice_setup/public/cpp/multidevice_setup_client_impl_unittest.cc
index e674b76..664ca79 100644
--- a/chromeos/ash/services/multidevice_setup/public/cpp/multidevice_setup_client_impl_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/public/cpp/multidevice_setup_client_impl_unittest.cc
@@ -8,8 +8,6 @@
#include <tuple>
#include <utility>
-#include "ash/services/multidevice_setup/multidevice_setup_initializer.h"
-#include "ash/services/multidevice_setup/multidevice_setup_service.h"
#include "base/bind.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
@@ -17,6 +15,8 @@
#include "base/test/metrics/histogram_tester.h"
#include "base/test/task_environment.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_initializer.h"
+#include "chromeos/ash/services/multidevice_setup/multidevice_setup_service.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/android_sms_app_helper_delegate.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/android_sms_pairing_state_tracker.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/fake_multidevice_setup.h"
diff --git a/chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom b/chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom
index 4a9c70ed..6dbaadf 100644
--- a/chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom
+++ b/chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom
@@ -142,8 +142,9 @@
};
// Delegate used to notify Chrome OS UI (//ash) of multidevice account changes
-// from the multidevice setup service (//ash/services/multidevice_setup).
-// Both sides currently live in the Chrome process.
+// from the multidevice setup service
+// (//chromeos/ash/services/multidevice_setup). Both sides currently live in the
+// Chrome process.
interface AccountStatusChangeDelegate {
// Callback which indicates that one or more MultiDevice host phones are
// available for setup with the MultiDevice setup flow. This function is only
diff --git a/ash/services/multidevice_setup/wifi_sync_notification_controller.cc b/chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.cc
similarity index 94%
rename from ash/services/multidevice_setup/wifi_sync_notification_controller.cc
rename to chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.cc
index 12bdae7..a434e4a 100644
--- a/ash/services/multidevice_setup/wifi_sync_notification_controller.cc
+++ b/chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.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 "ash/services/multidevice_setup/wifi_sync_notification_controller.h"
+#include "chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include <memory>
#include "ash/services/device_sync/public/cpp/device_sync_client.h"
-#include "ash/services/multidevice_setup/account_status_change_delegate_notifier.h"
-#include "ash/services/multidevice_setup/global_state_feature_manager.h"
-#include "ash/services/multidevice_setup/host_status_provider.h"
#include "base/memory/ptr_util.h"
#include "base/power_monitor/power_monitor.h"
#include "chromeos/ash/components/multidevice/logging/logging.h"
#include "chromeos/ash/components/multidevice/remote_device_ref.h"
#include "chromeos/ash/components/multidevice/software_feature.h"
#include "chromeos/ash/components/multidevice/software_feature_state.h"
+#include "chromeos/ash/services/multidevice_setup/account_status_change_delegate_notifier.h"
+#include "chromeos/ash/services/multidevice_setup/global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/host_status_provider.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/prefs.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "components/prefs/pref_registry_simple.h"
diff --git a/ash/services/multidevice_setup/wifi_sync_notification_controller.h b/chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h
similarity index 92%
rename from ash/services/multidevice_setup/wifi_sync_notification_controller.h
rename to chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h
index ba1086d1..d64d717 100644
--- a/ash/services/multidevice_setup/wifi_sync_notification_controller.h
+++ b/chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SERVICES_MULTIDEVICE_SETUP_WIFI_SYNC_NOTIFICATION_CONTROLLER_H_
-#define ASH_SERVICES_MULTIDEVICE_SETUP_WIFI_SYNC_NOTIFICATION_CONTROLLER_H_
+#ifndef CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_WIFI_SYNC_NOTIFICATION_CONTROLLER_H_
+#define CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_WIFI_SYNC_NOTIFICATION_CONTROLLER_H_
#include <memory>
@@ -96,4 +96,4 @@
} // namespace ash
-#endif // ASH_SERVICES_MULTIDEVICE_SETUP_WIFI_SYNC_NOTIFICATION_CONTROLLER_H_
+#endif // CHROMEOS_ASH_SERVICES_MULTIDEVICE_SETUP_WIFI_SYNC_NOTIFICATION_CONTROLLER_H_
diff --git a/ash/services/multidevice_setup/wifi_sync_notification_controller_unittest.cc b/chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller_unittest.cc
similarity index 95%
rename from ash/services/multidevice_setup/wifi_sync_notification_controller_unittest.cc
rename to chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller_unittest.cc
index a07dd60e..48c36f3 100644
--- a/ash/services/multidevice_setup/wifi_sync_notification_controller_unittest.cc
+++ b/chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller_unittest.cc
@@ -2,21 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/services/multidevice_setup/wifi_sync_notification_controller.h"
+#include "chromeos/ash/services/multidevice_setup/wifi_sync_notification_controller.h"
#include <memory>
#include "ash/constants/ash_features.h"
#include "ash/services/device_sync/public/cpp/fake_device_sync_client.h"
-#include "ash/services/multidevice_setup/fake_account_status_change_delegate.h"
-#include "ash/services/multidevice_setup/fake_account_status_change_delegate_notifier.h"
-#include "ash/services/multidevice_setup/fake_global_state_feature_manager.h"
-#include "ash/services/multidevice_setup/fake_host_status_provider.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
#include "chromeos/ash/components/multidevice/remote_device_test_util.h"
#include "chromeos/ash/components/multidevice/software_feature.h"
#include "chromeos/ash/components/multidevice/software_feature_state.h"
+#include "chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate.h"
+#include "chromeos/ash/services/multidevice_setup/fake_account_status_change_delegate_notifier.h"
+#include "chromeos/ash/services/multidevice_setup/fake_global_state_feature_manager.h"
+#include "chromeos/ash/services/multidevice_setup/fake_host_status_provider.h"
#include "chromeos/ash/services/multidevice_setup/public/cpp/prefs.h"
#include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
#include "components/session_manager/core/session_manager.h"
