Reland "QA Lacros: Move //{ash => chromeos}/components/quick_answers"

This reverts commit 3761ef5.

Reason for revert: Fixed issue in tools/traffic_annotation/auditor/chromeos/safe_list.txt

Original change's description:
> Revert "QA Lacros: Move //{ash => chromeos}/components/quick_answers"
>
> This reverts commit 49d788e.
>
> Reason for revert: Failures in linux-chromeos-annotator-rel
>
> Original change's description:
> > QA Lacros: Move //{ash => chromeos}/components/quick_answers
> >
> > Move the QuickAnswers source to chromeos since it will be shared by ash
> > and lacros.
> >
> > DD: go/qa-lacros-alternatives
> >
> > Bug: b/206453061
> > Test: Run existing tests
> > Change-Id: I27d721284ddb8627b2de32f161dc93f17c840ef0
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3282642
> > Reviewed-by: Robert Sesek <rsesek@chromium.org>
> > Reviewed-by: Erik Chen <erikchen@chromium.org>
> > Reviewed-by: Jason Thai <jasontt@chromium.org>
> > Reviewed-by: Avi Drissman <avi@chromium.org>
> > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> > Commit-Queue: Yue Li <updowndota@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#943349}
>
> Bug: b/206453061
> Change-Id: Ia33220372a141f34891871bbf70ba1c6b348a288
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3293249
> Reviewed-by: Avi Drissman <avi@chromium.org>
> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> Commit-Queue: Renato Silva <rrsilva@google.com>
> Cr-Commit-Position: refs/heads/main@{#943569}

Bug: b/206453061
Change-Id: Iea58be3f8d50a3f45c793e232a951441a977c25c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3293762
Reviewed-by: Erik Chen <erikchen@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Nicolas Ouellet-Payeur <nicolaso@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Yue Li <updowndota@chromium.org>
Cr-Commit-Position: refs/heads/main@{#943683}

WATCHLISTS

@@ -1604,9 +1604,9 @@
       'filepath': 'push_messaging'
     },
     'quick_answers': {
-      'filepath': 'ash/components/quick_answers/'\
-                  '|ash/quick_answers/'\
-                  '|chrome/browser/renderer_context_menu/quick_answers.*'
+      'filepath': 'ash/quick_answers/'\
+                  '|chrome/browser/renderer_context_menu/quick_answers.*'\
+                  '|chromeos/components/quick_answers/'
     },
     'relaunch_notification': {
       'filepath': 'chrome/browser/ui/views/relaunch_notification'

ash/BUILD.gn

@@ -1982,8 +1982,6 @@ component("ash") {
     "//ash/components/fwupd",
     "//ash/components/pcie_peripheral",
     "//ash/components/phonehub",
-    "//ash/components/quick_answers",
-    "//ash/components/quick_answers/public/cpp:prefs",
     "//ash/components/settings",
     "//ash/constants",
     "//ash/dbus:privacy_screen_proto",
@@ -2012,6 +2010,7 @@ component("ash") {
     "//chromeos/assistant:buildflags",
     "//chromeos/components/feature_usage",
     "//chromeos/components/multidevice/logging",
+    "//chromeos/components/quick_answers/public/cpp:prefs",
     "//chromeos/components/sensors:buildflags",
     "//chromeos/components/sensors:sensors",
     "//chromeos/components/sensors/mojom",
@@ -2667,7 +2666,6 @@ test("ash_unittests") {
     "//ash/components/arc:notification_test_support",
     "//ash/components/audio",
     "//ash/components/phonehub:test_support",
-    "//ash/components/quick_answers:quick_answers",
     "//ash/constants",
     "//ash/keyboard/ui",
     "//ash/keyboard/ui:test_support",

ash/DEPS

@@ -57,6 +57,7 @@ include_rules = [
   "+chromeos/components/feature_usage",
   "+chromeos/components/multidevice",
   "+chromeos/components/proximity_auth/public",
+  "+chromeos/components/quick_answers",
   "+chromeos/components/sensors",
   # crosapi is an API to support lacros.
   "+chromeos/crosapi",

ash/ash_prefs.cc

@@ -12,7 +12,6 @@
 #include "ash/assistant/assistant_controller_impl.h"
 #include "ash/capture_mode/capture_mode_controller.h"
 #include "ash/clipboard/clipboard_nudge_controller.h"
-#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "ash/constants/ash_features.h"
 #include "ash/constants/ash_pref_names.h"
 #include "ash/detachable_base/detachable_base_handler.h"
@@ -51,6 +50,7 @@
 #include "ash/wm/desks/persistent_desks_bar_controller.h"
 #include "ash/wm/desks/templates/desks_templates_util.h"
 #include "ash/wm/window_cycle/window_cycle_controller.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"

ash/components/BUILD.gn

@@ -19,7 +19,6 @@ source_set("unit_tests") {
     "//ash/components/pcie_peripheral:unit_tests",
     "//ash/components/phonehub:unit_tests",
     "//ash/components/power:unit_tests",
-    "//ash/components/quick_answers:unit_tests",
     "//ash/components/security_token_pin:unit_tests",
     "//ash/components/settings:unit_tests",
     "//ash/components/smbfs:unit_tests",

ash/public/cpp/BUILD.gn

@@ -347,11 +347,11 @@ component("cpp") {
 
   deps = [
     "//ash/components/audio",
-    "//ash/components/quick_answers/public/cpp:prefs",
     "//ash/constants",
     "//ash/public/cpp/ambient/proto",
     "//ash/strings",
     "//base",
+    "//chromeos/components/quick_answers/public/cpp:prefs",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/bluetooth_config:in_process_bluetooth_config",

ash/public/cpp/quick_answers/quick_answers_state.h

@@ -8,11 +8,11 @@
 #include <memory>
 #include <string>
 
-#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "ash/public/cpp/ash_public_export.h"
 #include "base/observer_list.h"
 #include "base/observer_list_types.h"
 #include "base/timer/timer.h"
+#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
 
 class PrefChangeRegistrar;
 class PrefService;

chrome/browser/BUILD.gn

@@ -2437,7 +2437,6 @@ static_library("browser") {
     deps += [
       "//ash/components/audio",
       "//ash/components/device_activity:device_activity",
-      "//ash/components/quick_answers/public/cpp:prefs",
       "//ash/components/timezone",
       "//ash/constants",
       "//ash/webui/camera_app_ui",
@@ -2482,6 +2481,7 @@ static_library("browser") {
       "//chromeos/components/local_search_service/public/cpp:cpp",
       "//chromeos/components/local_search_service/public/mojom",
       "//chromeos/components/multidevice/debug_webui",
+      "//chromeos/components/quick_answers/public/cpp:prefs",
       "//chromeos/dbus/attestation",
       "//chromeos/dbus/attestation:attestation_proto",
       "//chromeos/dbus/cros_disks",
@@ -4875,7 +4875,6 @@ static_library("browser") {
       "//ash/components/arc:arc_base",
       "//ash/components/arc:arc_base_utils",
       "//ash/components/geolocation",
-      "//ash/components/quick_answers",
       "//ash/components/settings",
       "//ash/public/cpp",
       "//ash/public/cpp/external_arc",
@@ -4904,6 +4903,7 @@ static_library("browser") {
       "//chrome/services/sharing/public/proto",
       "//chrome/services/speech:lib",
       "//chromeos/components/feature_usage",
+      "//chromeos/components/quick_answers",
       "//chromeos/components/sync_wifi",
       "//chromeos/crosapi/cpp",
       "//chromeos/crosapi/mojom",

chrome/browser/ash/chrome_browser_main_parts_ash.cc

@@ -19,7 +19,6 @@
 #include "ash/components/fwupd/firmware_update_manager.h"
 #include "ash/components/pcie_peripheral/pcie_peripheral_manager.h"
 #include "ash/components/power/dark_resume_controller.h"
-#include "ash/components/quick_answers/quick_answers_client.h"
 #include "ash/components/settings/cros_settings_names.h"
 #include "ash/constants/ash_features.h"
 #include "ash/constants/ash_switches.h"
@@ -181,6 +180,7 @@
 #include "chrome/common/pref_names.h"
 #include "chromeos/components/chromebox_for_meetings/buildflags/buildflags.h"  // PLATFORM_CFM
 #include "chromeos/components/local_search_service/public/cpp/local_search_service_proxy_factory.h"
+#include "chromeos/components/quick_answers/quick_answers_client.h"
 #include "chromeos/components/sensors/ash/sensor_hal_dispatcher.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/cryptohome/system_salt_getter.h"

chrome/browser/chromeos/BUILD.gn

@@ -92,8 +92,6 @@ source_set("chromeos") {
     "//ash/components/phonehub",
     "//ash/components/phonehub/proto",
     "//ash/components/power",
-    "//ash/components/quick_answers:quick_answers",
-    "//ash/components/quick_answers/public/cpp:prefs",
     "//ash/components/settings",
     "//ash/components/smbfs",
     "//ash/components/smbfs/mojom",
@@ -200,6 +198,8 @@ source_set("chromeos") {
     "//chromeos/components/multidevice:stub_multidevice_util",
     "//chromeos/components/multidevice/logging",
     "//chromeos/components/proximity_auth",
+    "//chromeos/components/quick_answers",
+    "//chromeos/components/quick_answers/public/cpp:prefs",
     "//chromeos/components/remote_apps/mojom",
     "//chromeos/components/sensors",
     "//chromeos/components/sensors:buildflags",

chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc

@@ -14,7 +14,6 @@
 
 #include "ash/components/arc/arc_prefs.h"
 #include "ash/components/arc/metrics/arc_metrics_constants.h"
-#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "ash/components/settings/cros_settings_names.h"
 #include "ash/constants/app_types.h"
 #include "ash/constants/ash_pref_names.h"
@@ -128,6 +127,7 @@
 #include "chrome/browser/web_applications/web_app_registrar.h"
 #include "chrome/common/extensions/api/autotest_private.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager/session_manager_client.h"
 #include "chromeos/printing/printer_configuration.h"

chrome/browser/extensions/BUILD.gn

@@ -1114,7 +1114,6 @@ static_library("extensions") {
     deps += [
       "//ash",
       "//ash/components/enhanced_network_tts/mojom",
-      "//ash/components/quick_answers/public/cpp:prefs",
       "//ash/components/settings",
       "//ash/constants",
       "//ash/keyboard/ui:resources_grit_grit",
@@ -1131,6 +1130,7 @@ static_library("extensions") {
       "//chromeos/attestation",
       "//chromeos/components/chromebox_for_meetings/buildflags",
       "//chromeos/components/proximity_auth",
+      "//chromeos/components/quick_answers/public/cpp:prefs",
       "//chromeos/components/remote_apps/mojom",
       "//chromeos/cryptohome",
       "//chromeos/dbus",

chrome/browser/extensions/api/settings_private/prefs_util.cc

@@ -59,7 +59,6 @@
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "ash/components/arc/arc_prefs.h"
-#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "ash/components/settings/cros_settings_names.h"
 #include "ash/constants/ash_pref_names.h"
 #include "ash/constants/ash_pref_names.h"  // nogncheck
@@ -77,6 +76,7 @@
 #include "chrome/browser/ash/system/timezone_util.h"
 #include "chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_method_short.h"
 #include "chrome/browser/extensions/api/settings_private/chromeos_resolve_time_zone_by_geolocation_on_off.h"
+#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
 #include "components/account_manager_core/pref_names.h"
 #include "ui/chromeos/events/pref_names.h"

chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -11,7 +11,6 @@
 #include <utility>
 #include <vector>
 
-#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/cxx17_backports.h"
@@ -50,6 +49,7 @@
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
 #include "components/autofill/core/browser/autofill_address_policy_handler.h"
 #include "components/autofill/core/browser/autofill_credit_card_policy_handler.h"

chrome/browser/prefs/browser_prefs.cc

@@ -273,7 +273,6 @@
 #include "ash/components/arc/arc_prefs.h"
 #include "ash/components/audio/audio_devices_pref_handler_impl.h"
 #include "ash/components/device_activity/device_activity_controller.h"
-#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "ash/components/timezone/timezone_resolver.h"
 #include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/ash_prefs.h"
@@ -374,6 +373,7 @@
 #include "chrome/browser/upgrade_detector/upgrade_detector_chromeos.h"
 #include "chrome/browser/web_applications/externally_installed_web_app_prefs.h"
 #include "chromeos/components/local_search_service/search_metrics_reporter.h"
+#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "chromeos/network/cellular_esim_profile_handler_impl.h"
 #include "chromeos/network/cellular_metrics_logger.h"
 #include "chromeos/network/fast_transition_observer.h"

chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc

@@ -6,7 +6,6 @@
 
 #include <utility>
 
-#include "ash/components/quick_answers/quick_answers_model.h"
 #include "ash/public/cpp/assistant/controller/assistant_interaction_controller.h"
 #include "ash/public/cpp/quick_answers/controller/quick_answers_controller.h"
 #include "ash/public/cpp/quick_answers/quick_answers_state.h"
@@ -19,6 +18,7 @@
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chromeos/components/quick_answers/quick_answers_model.h"
 #include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "components/language/core/browser/pref_names.h"
 #include "components/prefs/pref_service.h"

chrome/browser/ui/BUILD.gn

@@ -2856,8 +2856,6 @@ static_library("ui") {
       "//ash/components/pcie_peripheral",
       "//ash/components/phonehub",
       "//ash/components/phonehub:debug",
-      "//ash/components/quick_answers",
-      "//ash/components/quick_answers/public/cpp:prefs",
       "//ash/components/settings",
       "//ash/constants",
       "//ash/keyboard/ui",
@@ -2936,6 +2934,8 @@ static_library("ui") {
       "//chromeos/components/multidevice/debug_webui",
       "//chromeos/components/multidevice/logging",
       "//chromeos/components/proximity_auth",
+      "//chromeos/components/quick_answers",
+      "//chromeos/components/quick_answers/public/cpp:prefs",
       "//chromeos/components/string_matching",
       "//chromeos/components/tether",
       "//chromeos/constants",

chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.h"
 
-#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "ash/constants/ash_features.h"
 #include "ash/public/cpp/new_window_delegate.h"
 #include "ash/public/cpp/quick_answers/quick_answers_state.h"
@@ -13,6 +12,7 @@
 #include "ash/strings/grit/ash_strings.h"
 #include "base/metrics/histogram_functions.h"
 #include "chrome/browser/ui/ash/quick_answers/quick_answers_ui_controller.h"
+#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"

chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.h

@@ -8,10 +8,10 @@
 #include <memory>
 #include <string>
 
-#include "ash/components/quick_answers/quick_answers_client.h"
-#include "ash/components/quick_answers/quick_answers_model.h"
 #include "ash/public/cpp/quick_answers/controller/quick_answers_controller.h"
 #include "chrome/browser/ui/ash/quick_answers/quick_answers_state_controller.h"
+#include "chromeos/components/quick_answers/quick_answers_client.h"
+#include "chromeos/components/quick_answers/quick_answers_model.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {

chrome/browser/ui/ash/quick_answers/quick_answers_controller_unittest.cc

@@ -4,13 +4,13 @@
 
 #include "chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.h"
 
-#include "ash/components/quick_answers/quick_answers_client.h"
 #include "ash/public/cpp/quick_answers/quick_answers_state.h"
 #include "base/memory/scoped_refptr.h"
 #include "chrome/browser/ui/ash/quick_answers/quick_answers_ui_controller.h"
 #include "chrome/browser/ui/ash/quick_answers/test/chrome_quick_answers_test_base.h"
 #include "chrome/browser/ui/ash/quick_answers/ui/quick_answers_view.h"
 #include "chrome/browser/ui/ash/quick_answers/ui/user_consent_view.h"
+#include "chromeos/components/quick_answers/quick_answers_client.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
 #include "services/network/test/test_url_loader_factory.h"
 

chrome/browser/ui/ash/quick_answers/quick_answers_ui_controller.cc

@@ -4,14 +4,14 @@
 
 #include "chrome/browser/ui/ash/quick_answers/quick_answers_ui_controller.h"
 
-#include "ash/components/quick_answers/quick_answers_model.h"
 #include "ash/public/cpp/new_window_delegate.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/bind.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.h"
 #include "chrome/browser/ui/ash/quick_answers/ui/quick_answers_view.h"
 #include "chrome/browser/ui/ash/quick_answers/ui/user_consent_view.h"
+#include "chromeos/components/quick_answers/quick_answers_model.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/escape.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

chrome/browser/ui/ash/quick_answers/ui/quick_answers_view.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/ash/quick_answers/ui/quick_answers_view.h"
 
-#include "ash/components/quick_answers/quick_answers_model.h"
 #include "ash/public/cpp/app_list/vector_icons/vector_icons.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
@@ -13,6 +12,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/quick_answers/quick_answers_ui_controller.h"
 #include "chrome/browser/ui/ash/quick_answers/ui/quick_answers_pre_target_handler.h"
+#include "chromeos/components/quick_answers/quick_answers_model.h"
 #include "chromeos/ui/vector_icons/vector_icons.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_header_macros.h"

chrome/test/BUILD.gn

@@ -6607,7 +6607,6 @@ test("unit_tests") {
       "//ash:test_support",
       "//ash/app_list:test_support",
       "//ash/components/arc:arc_test_support",
-      "//ash/components/quick_answers:quick_answers",
       "//ash/public/cpp/assistant/test_support",
       "//ash/public/cpp/resources:ash_public_unscaled_resources",
       "//ash/resources/vector_icons",
@@ -6638,6 +6637,7 @@ test("unit_tests") {
       "//chrome/services/sharing/nearby/decoder:unit_tests",
       "//chrome/services/sharing/nearby/platform:unit_tests",
       "//chromeos/assistant:buildflags",
+      "//chromeos/components/quick_answers:quick_answers",
       "//chromeos/constants",
       "//chromeos/dbus/image_loader",
       "//chromeos/dbus/u2f",

chromeos/components/BUILD.gn

@@ -28,6 +28,7 @@ test("chromeos_components_unittests") {
     "//chromeos/components/mojo_bootstrap:unit_tests",
     "//chromeos/components/multidevice:unit_tests",
     "//chromeos/components/proximity_auth:unit_tests",
+    "//chromeos/components/quick_answers:unit_tests",
     "//chromeos/components/sensors:unit_tests",
     "//chromeos/components/string_matching:unit_tests",
     "//chromeos/components/sync_wifi:unit_tests",