Revert "Move //chromeos/{=>ash}/services/assistant [4/N]"

This reverts commit a7fae8b.

Reason for revert: Broke build on linux-chromeos-chrome.

Original change's description:
> Move //chromeos/{=>ash}/services/assistant [4/N]
>
> This CL moves public/cpp to chromeos/ash/services/assistant.
>
> This CL temporarily keeps headers which are used by internal assistant
> codes. They includes headers in ch/ash/services/assistant/public/cpp
> only to avoid internal builds broken and will be removed after being
> changing internal codes to use the new path.
>
> This CL is part of the Chrome OS source code directory migration:
> https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
>
> Change-Id: I363ad00232ba4ddc4135618631b378907553ac6f
> Bug: 1164001
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3686710
> Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
> Commit-Queue: Yeunjoo Choi <ychoi@igalia.com>
> Reviewed-by: Tao Wu <wutao@chromium.org>
> Owners-Override: Hidehiko Abe <hidehiko@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1013380}

Bug: 1164001, 1335888
Change-Id: I74806ae7a7755d16a23b64d44788d9e7694a728f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3702859
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
Owners-Override: Anders Hartvoll Ruud <andruud@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1013441}

ash/BUILD.gn

@@ -2227,7 +2227,6 @@ component("ash") {
     "//chromeos/ash/components/dbus/system_clock",
     "//chromeos/ash/components/dbus/usb",
     "//chromeos/ash/components/human_presence",
-    "//chromeos/ash/services/assistant/public/cpp",
     "//chromeos/components/feature_usage",
     "//chromeos/components/quick_answers/public/cpp:prefs",
     "//chromeos/components/sensors:buildflags",
@@ -2248,6 +2247,7 @@ component("ash") {
     "//chromeos/login/login_state",
     "//chromeos/metrics",
     "//chromeos/network",
+    "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/bluetooth_config/public/cpp",
     "//chromeos/services/bluetooth_config/public/mojom",
@@ -3025,7 +3025,6 @@ test("ash_unittests") {
     "//chromeos/ash/components/dbus/services:test_support",
     "//chromeos/ash/components/human_presence:human_presence",
     "//chromeos/ash/services/assistant:test_support",
-    "//chromeos/ash/services/assistant/public/cpp",
     "//chromeos/components/feature_usage",
     "//chromeos/components/sensors:sensors",
     "//chromeos/components/sensors:test_support",
@@ -3041,6 +3040,7 @@ test("ash_unittests") {
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/userdataauth",
     "//chromeos/network:test_support",
+    "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/bluetooth_config:test_support",
     "//chromeos/services/network_config/public/cpp",
@@ -3457,13 +3457,13 @@ static_library("test_support") {
     "//chromeos/ash/components/dbus/rgbkbd",
     "//chromeos/ash/components/dbus/system_clock",
     "//chromeos/ash/services/assistant:test_support",
-    "//chromeos/ash/services/assistant/public/cpp",
     "//chromeos/dbus:test_support",
     "//chromeos/dbus/audio",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/login/login_state",
     "//chromeos/network:test_support",
+    "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/bluetooth_config:test_support",
     "//chromeos/system",
     "//chromeos/ui/frame",

ash/DEPS

@@ -82,8 +82,8 @@ include_rules = [
   # TODO(https://crbug.com/1164001): remove when chromeos/network have migrated.
   "+chromeos/network",
   # //ash can use the public interfaces of various services.
-  "+chromeos/ash/services/assistant/public/cpp" ,
   "+chromeos/ash/services/assistant/test_support",
+  "+chromeos/services/assistant/public" ,
   "+chromeos/services/bluetooth_config",
   "+chromeos/services/libassistant/public",
   "+chromeos/services/machine_learning/public",

ash/ambient/ambient_controller.cc

@@ -46,10 +46,10 @@
 #include "build/buildflag.h"
 #include "cc/paint/skottie_wrapper.h"
 #include "chromeos/ash/components/assistant/buildflags.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
 #include "chromeos/dbus/power/power_manager_client.h"
 #include "chromeos/dbus/power_manager/backlight.pb.h"
 #include "chromeos/dbus/power_manager/idle.pb.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"

ash/app_list/BUILD.gn

@@ -188,8 +188,8 @@ source_set("app_list") {
     "//base/third_party/dynamic_annotations",
     "//cc/paint",
     "//chromeos",
-    "//chromeos/ash/services/assistant/public/cpp",
     "//chromeos/components/feature_usage",
+    "//chromeos/services/assistant/public/cpp",
     "//chromeos/ui/vector_icons",
     "//components/keyed_service/core",
     "//components/pref_registry",
@@ -327,8 +327,8 @@ source_set("unit_tests") {
     "//ash/search_box",
     "//base",
     "//base/test:test_support",
-    "//chromeos/ash/services/assistant/public/cpp",
     "//chromeos/components/feature_usage",
+    "//chromeos/services/assistant/public/cpp",
     "//mojo/core/embedder",
     "//mojo/public/cpp/bindings",
     "//skia",

ash/app_list/app_list_bubble_presenter.cc

@@ -33,7 +33,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/time/time.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_enums.h"
+#include "chromeos/services/assistant/public/cpp/assistant_enums.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"

ash/app_list/app_list_controller_impl.cc

@@ -67,7 +67,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_enums.h"
+#include "chromeos/services/assistant/public/cpp/assistant_enums.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "extensions/common/constants.h"

ash/app_list/app_list_presenter_impl.cc

@@ -31,7 +31,7 @@
 #include "base/containers/contains.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_enums.h"
+#include "chromeos/services/assistant/public/cpp/assistant_enums.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"

ash/app_list/views/app_list_bubble_view_unittest.cc

@@ -43,7 +43,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_enums.h"
+#include "chromeos/services/assistant/public/cpp/assistant_enums.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"

ash/app_list/views/assistant/assistant_page_view_unittest.cc

@@ -19,8 +19,8 @@
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_feature_list.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
 #include "chromeos/constants/chromeos_features.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkTypes.h"

ash/ash_prefs.cc

@@ -57,8 +57,8 @@
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/multitask_menu_nudge_controller.h"
 #include "ash/wm/window_cycle/window_cycle_controller.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
 #include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
+#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
 #include "components/language/core/browser/pref_names.h"
 #include "components/live_caption/pref_names.h"
 #include "components/soda/constants.h"

ash/assistant/assistant_alarm_timer_controller_impl.cc

@@ -15,8 +15,8 @@
 #include "base/i18n/message_formatter.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
-#include "chromeos/ash/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/features.h"
 #include "chromeos/services/libassistant/public/cpp/assistant_notification.h"
 #include "chromeos/services/libassistant/public/cpp/assistant_timer.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"

ash/assistant/assistant_alarm_timer_controller_impl.h

@@ -17,7 +17,7 @@
 #include "ash/public/cpp/assistant/controller/assistant_controller_observer.h"
 #include "base/scoped_observation.h"
 #include "base/timer/timer.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 
 namespace ash {
 

ash/assistant/assistant_alarm_timer_controller_unittest.cc

@@ -22,7 +22,7 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/test/task_environment.h"
 #include "base/time/time.h"
-#include "chromeos/ash/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/features.h"
 #include "chromeos/services/libassistant/public/cpp/assistant_notification.h"
 #include "chromeos/services/libassistant/public/cpp/assistant_timer.h"
 #include "testing/gmock/include/gmock/gmock.h"

ash/assistant/assistant_controller_impl.cc

@@ -20,10 +20,10 @@
 #include "ash/style/ash_color_provider.h"
 #include "base/bind.h"
 #include "base/memory/scoped_refptr.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_browser_delegate.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
-#include "chromeos/ash/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/assistant_browser_delegate.h"
+#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/features.h"
 #include "chromeos/services/libassistant/public/cpp/assistant_feedback.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"

ash/assistant/assistant_controller_impl.h

@@ -34,7 +34,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observation.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "components/prefs/pref_service.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"

ash/assistant/assistant_controller_impl_unittest.cc

@@ -20,8 +20,8 @@
 #include "ash/style/ash_color_provider.h"
 #include "base/scoped_observation.h"
 #include "base/test/scoped_feature_list.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
 #include "chromeos/constants/chromeos_features.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace ash {

ash/assistant/assistant_interaction_controller_impl.cc

@@ -33,7 +33,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chromeos/ash/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/features.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "net/base/url_util.h"

ash/assistant/assistant_interaction_controller_impl.h

@@ -22,7 +22,7 @@
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observation.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 
 class PrefRegistrySimple;

ash/assistant/assistant_interaction_controller_impl_unittest.cc

@@ -26,9 +26,9 @@
 #include "base/bind.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
-#include "chromeos/ash/services/assistant/public/cpp/features.h"
 #include "chromeos/ash/services/assistant/test_support/mock_assistant_interaction_subscriber.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/features.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace ash {

ash/assistant/assistant_notification_controller_impl.h

@@ -12,7 +12,7 @@
 #include "ash/assistant/model/assistant_notification_model.h"
 #include "ash/assistant/model/assistant_notification_model_observer.h"
 #include "ash/public/cpp/assistant/controller/assistant_notification_controller.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "chromeos/services/libassistant/public/cpp/assistant_notification.h"
 #include "chromeos/services/libassistant/public/mojom/notification_delegate.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"

ash/assistant/assistant_notification_controller_impl_unittest.cc

@@ -14,7 +14,7 @@
 #include "ash/assistant/test/test_assistant_service.h"
 #include "ash/shell.h"
 #include "base/test/task_environment.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/message_center.h"

ash/assistant/assistant_notification_expiry_monitor.cc

@@ -11,7 +11,7 @@
 #include "ash/assistant/model/assistant_notification_model_observer.h"
 #include "base/bind.h"
 #include "base/time/time.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 
 namespace ash {
 

ash/assistant/assistant_setup_controller.cc

@@ -10,8 +10,8 @@
 #include "ash/public/cpp/assistant/controller/assistant_ui_controller.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
-#include "chromeos/ash/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
+#include "chromeos/services/assistant/public/cpp/features.h"
 
 namespace {
 

ash/assistant/assistant_state_controller_unittest.cc

@@ -11,7 +11,7 @@
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
+#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
 #include "components/prefs/pref_service.h"
 
 namespace ash {

ash/assistant/assistant_suggestions_controller_impl.cc

@@ -20,8 +20,8 @@
 #include "base/containers/cxx20_erase.h"
 #include "base/rand_util.h"
 #include "base/unguessable_token.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
-#include "chromeos/ash/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
+#include "chromeos/services/assistant/public/cpp/features.h"
 #include "chromeos/services/libassistant/public/cpp/assistant_suggestion.h"
 #include "ui/base/l10n/l10n_util.h"
 

ash/assistant/assistant_suggestions_controller_impl_unittest.cc

@@ -7,7 +7,7 @@
 #include "ash/assistant/model/assistant_suggestions_model.h"
 #include "ash/assistant/test/assistant_ash_test_base.h"
 #include "ash/public/cpp/assistant/controller/assistant_suggestions_controller.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
+#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
 
 namespace ash {
 

ash/assistant/assistant_ui_controller_impl.cc

@@ -22,9 +22,9 @@
 #include "ash/system/toast/toast_manager_impl.h"
 #include "base/bind.h"
 #include "base/metrics/histogram_functions.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
-#include "chromeos/ash/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/features.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

ash/assistant/assistant_view_delegate_impl.cc

@@ -20,8 +20,8 @@
 #include "ash/shell.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "base/command_line.h"
-#include "chromeos/ash/services/assistant/public/cpp/features.h"
-#include "chromeos/ash/services/assistant/public/cpp/switches.h"
+#include "chromeos/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/switches.h"
 
 namespace ash {
 

ash/assistant/model/BUILD.gn

@@ -47,7 +47,7 @@ component("model") {
   deps = [
     "//ash/assistant/ui:constants",
     "//ash/public/cpp",
-    "//chromeos/ash/services/assistant/public/cpp",
+    "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/libassistant/public/cpp:structs",
     "//ui/accessibility/mojom:ax_assistant_mojom",

ash/assistant/model/DEPS

@@ -7,6 +7,6 @@ include_rules = [
   "+ash/public/cpp/app_list",
   "+ash/public/cpp/assistant",
   "+ash/public/mojom",
-  "+chromeos/ash/services/assistant/public/cpp" ,
+  "+chromeos/services/assistant/public" ,
   "+ui/gfx/geometry",
 ]

ash/assistant/model/assistant_query.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/component_export.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 
 namespace ash {
 

ash/assistant/model/assistant_response.cc

@@ -13,8 +13,8 @@
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/unguessable_token.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
-#include "chromeos/ash/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/features.h"
 
 namespace ash {
 

ash/assistant/model/assistant_response_observer.h

@@ -9,7 +9,7 @@
 
 #include "base/component_export.h"
 #include "base/observer_list_types.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 
 namespace ash {
 

ash/assistant/model/assistant_ui_model.h

@@ -10,7 +10,7 @@
 #include "ash/assistant/ui/assistant_ui_constants.h"
 #include "base/component_export.h"
 #include "base/observer_list.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/gfx/geometry/rect.h"
 

ash/assistant/test/assistant_ash_test_base.h

@@ -12,7 +12,7 @@
 #include "ash/assistant/model/assistant_ui_model.h"
 #include "ash/assistant/test/mocked_assistant_interaction.h"
 #include "ash/test/ash_test_base.h"
-#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
+#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
 
 namespace aura {
 class Window;