Move //{chromeos => ash}/components/quick_answers
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Bug: 1164001
Change-Id: I88b49cc0caa81d9697e36e210f0a7e57fed0e7f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3127467
Commit-Queue: Yeunjoo Choi <ychoi@igalia.com>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Owners-Override: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/main@{#916629}
diff --git a/WATCHLISTS b/WATCHLISTS
index fa7a6107..0fbbb375 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -1606,9 +1606,9 @@
'filepath': 'push_messaging'
},
'quick_answers': {
- 'filepath': 'ash/quick_answers/'\
- '|chrome/browser/renderer_context_menu/quick_answers.*'\
- '|chromeos/components/quick_answers/'
+ 'filepath': 'ash/components/quick_answers/'\
+ '|ash/quick_answers/'\
+ '|chrome/browser/renderer_context_menu/quick_answers.*'
},
'relaunch_notification': {
'filepath': 'chrome/browser/ui/views/relaunch_notification'
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index 5908b97..1c2dafa 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -1895,6 +1895,8 @@
"//ash/assistant/util",
"//ash/components/audio",
"//ash/components/pcie_peripheral",
+ "//ash/components/quick_answers",
+ "//ash/components/quick_answers/public/cpp:prefs",
"//ash/constants",
"//ash/keyboard/ui",
"//ash/login/resources:resources_grit",
@@ -1918,8 +1920,6 @@
"//chromeos/components/feature_usage",
"//chromeos/components/multidevice/logging",
"//chromeos/components/phonehub",
- "//chromeos/components/quick_answers",
- "//chromeos/components/quick_answers/public/cpp:prefs",
"//chromeos/components/sensors:buildflags",
"//chromeos/components/sensors:sensors",
"//chromeos/components/sensors/mojom",
@@ -2541,6 +2541,7 @@
"//ash/assistant/util",
"//ash/components:unit_tests",
"//ash/components/audio",
+ "//ash/components/quick_answers:quick_answers",
"//ash/constants",
"//ash/keyboard/ui",
"//ash/keyboard/ui:test_support",
@@ -2564,7 +2565,6 @@
"//chromeos:test_support",
"//chromeos/components/feature_usage",
"//chromeos/components/phonehub:test_support",
- "//chromeos/components/quick_answers:quick_answers",
"//chromeos/components/sensors:sensors",
"//chromeos/components/sensors:test_support",
"//chromeos/components/sensors/mojom",
diff --git a/ash/DEPS b/ash/DEPS
index 5b636e4be..0dbb6f1 100644
--- a/ash/DEPS
+++ b/ash/DEPS
@@ -56,7 +56,6 @@
"+chromeos/components/multidevice/logging/logging.h",
"+chromeos/components/phonehub",
"+chromeos/components/proximity_auth/public/mojom",
- "+chromeos/components/quick_answers",
"+chromeos/components/sensors",
"+chromeos/crosapi/cpp/crosapi_constants.h",
"+chromeos/crosapi/mojom",
diff --git a/ash/ash_prefs.cc b/ash/ash_prefs.cc
index b823c651..2b79dd8 100644
--- a/ash/ash_prefs.cc
+++ b/ash/ash_prefs.cc
@@ -11,6 +11,7 @@
#include "ash/app_list/app_list_controller_impl.h"
#include "ash/assistant/assistant_controller_impl.h"
#include "ash/clipboard/clipboard_nudge_controller.h"
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "ash/constants/ash_pref_names.h"
#include "ash/detachable_base/detachable_base_handler.h"
#include "ash/display/display_prefs.h"
@@ -43,7 +44,6 @@
#include "ash/wallpaper/wallpaper_controller_impl.h"
#include "ash/wm/desks/desks_restore_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/live_caption/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
diff --git a/ash/components/BUILD.gn b/ash/components/BUILD.gn
index b4bd2e7..b2166f4 100644
--- a/ash/components/BUILD.gn
+++ b/ash/components/BUILD.gn
@@ -15,6 +15,7 @@
"//ash/components/drivefs:unit_tests",
"//ash/components/pcie_peripheral:unit_tests",
"//ash/components/power:unit_tests",
+ "//ash/components/quick_answers:unit_tests",
"//ash/components/security_token_pin:unit_tests",
]
diff --git a/chromeos/components/quick_answers/BUILD.gn b/ash/components/quick_answers/BUILD.gn
similarity index 96%
rename from chromeos/components/quick_answers/BUILD.gn
rename to ash/components/quick_answers/BUILD.gn
index 6b10564..08d66351 100644
--- a/chromeos/components/quick_answers/BUILD.gn
+++ b/ash/components/quick_answers/BUILD.gn
@@ -44,11 +44,11 @@
"utils/unit_converter.h",
]
deps = [
+ "//ash/components/quick_answers/public/cpp:prefs",
"//ash/constants",
"//ash/public/cpp",
"//ash/public/mojom",
"//base",
- "//chromeos/components/quick_answers/public/cpp:prefs",
"//chromeos/services/assistant/public/shared",
"//chromeos/services/machine_learning/public/cpp",
"//chromeos/services/machine_learning/public/mojom",
@@ -86,12 +86,12 @@
deps = [
":quick_answers",
+ "//ash/components/quick_answers/public/cpp:prefs",
"//ash/constants",
"//ash/public/cpp",
"//ash/public/mojom",
"//base",
"//base/test:test_support",
- "//chromeos/components/quick_answers/public/cpp:prefs",
"//chromeos/services/assistant/public/shared",
"//chromeos/services/machine_learning/public/cpp:stub",
"//chromeos/services/machine_learning/public/mojom",
diff --git a/ash/components/quick_answers/DEPS b/ash/components/quick_answers/DEPS
new file mode 100644
index 0000000..b7ca74a6
--- /dev/null
+++ b/ash/components/quick_answers/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+ "+third_party/cld_3/src/src/nnet_language_identifier.h",
+]
diff --git a/chromeos/components/quick_answers/public/cpp/BUILD.gn b/ash/components/quick_answers/public/cpp/BUILD.gn
similarity index 100%
rename from chromeos/components/quick_answers/public/cpp/BUILD.gn
rename to ash/components/quick_answers/public/cpp/BUILD.gn
diff --git a/chromeos/components/quick_answers/public/cpp/quick_answers_prefs.cc b/ash/components/quick_answers/public/cpp/quick_answers_prefs.cc
similarity index 96%
rename from chromeos/components/quick_answers/public/cpp/quick_answers_prefs.cc
rename to ash/components/quick_answers/public/cpp/quick_answers_prefs.cc
index 83b804c9..9565cdb 100644
--- a/chromeos/components/quick_answers/public/cpp/quick_answers_prefs.cc
+++ b/ash/components/quick_answers/public/cpp/quick_answers_prefs.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "components/prefs/pref_registry_simple.h"
diff --git a/chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h b/ash/components/quick_answers/public/cpp/quick_answers_prefs.h
similarity index 83%
rename from chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h
rename to ash/components/quick_answers/public/cpp/quick_answers_prefs.h
index 2956eb2..dddbd84 100644
--- a/chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h
+++ b/ash/components/quick_answers/public/cpp/quick_answers_prefs.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_PUBLIC_CPP_QUICK_ANSWERS_PREFS_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_PUBLIC_CPP_QUICK_ANSWERS_PREFS_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_PUBLIC_CPP_QUICK_ANSWERS_PREFS_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_PUBLIC_CPP_QUICK_ANSWERS_PREFS_H_
class PrefRegistrySimple;
@@ -40,4 +40,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_PUBLIC_CPP_QUICK_ANSWERS_PREFS_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_PUBLIC_CPP_QUICK_ANSWERS_PREFS_H_
diff --git a/chromeos/components/quick_answers/quick_answers_client.cc b/ash/components/quick_answers/quick_answers_client.cc
similarity index 94%
rename from chromeos/components/quick_answers/quick_answers_client.cc
rename to ash/components/quick_answers/quick_answers_client.cc
index 49023596..ea347d4 100644
--- a/chromeos/components/quick_answers/quick_answers_client.cc
+++ b/ash/components/quick_answers/quick_answers_client.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/quick_answers_client.h"
+#include "ash/components/quick_answers/quick_answers_client.h"
#include <utility>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/utils/quick_answers_metrics.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "ash/constants/ash_features.h"
#include "base/containers/contains.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_metrics.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
namespace chromeos {
namespace quick_answers {
diff --git a/chromeos/components/quick_answers/quick_answers_client.h b/ash/components/quick_answers/quick_answers_client.h
similarity index 93%
rename from chromeos/components/quick_answers/quick_answers_client.h
rename to ash/components/quick_answers/quick_answers_client.h
index 4b243c60..540ded6 100644
--- a/chromeos/components/quick_answers/quick_answers_client.h
+++ b/ash/components/quick_answers/quick_answers_client.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_CLIENT_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_CLIENT_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_CLIENT_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_CLIENT_H_
#include <memory>
#include <string>
-#include "chromeos/components/quick_answers/result_loader.h"
-#include "chromeos/components/quick_answers/understanding/intent_generator.h"
+#include "ash/components/quick_answers/result_loader.h"
+#include "ash/components/quick_answers/understanding/intent_generator.h"
namespace network {
namespace mojom {
@@ -134,4 +134,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_CLIENT_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_CLIENT_H_
diff --git a/chromeos/components/quick_answers/quick_answers_client_unittest.cc b/ash/components/quick_answers/quick_answers_client_unittest.cc
similarity index 97%
rename from chromeos/components/quick_answers/quick_answers_client_unittest.cc
rename to ash/components/quick_answers/quick_answers_client_unittest.cc
index 5fe674a..9e7cc2f 100644
--- a/chromeos/components/quick_answers/quick_answers_client_unittest.cc
+++ b/ash/components/quick_answers/quick_answers_client_unittest.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/quick_answers_client.h"
+#include "ash/components/quick_answers/quick_answers_client.h"
#include <memory>
#include <string>
#include <utility>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/test/test_helpers.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "ash/constants/ash_features.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/test/test_helpers.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
#include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/test/test_url_loader_factory.h"
diff --git a/chromeos/components/quick_answers/quick_answers_model.cc b/ash/components/quick_answers/quick_answers_model.cc
similarity index 94%
rename from chromeos/components/quick_answers/quick_answers_model.cc
rename to ash/components/quick_answers/quick_answers_model.cc
index 9bfb7ad4..39cbb5b2 100644
--- a/chromeos/components/quick_answers/quick_answers_model.cc
+++ b/ash/components/quick_answers/quick_answers_model.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/quick_answers_model.h"
namespace chromeos {
diff --git a/chromeos/components/quick_answers/quick_answers_model.h b/ash/components/quick_answers/quick_answers_model.h
similarity index 96%
rename from chromeos/components/quick_answers/quick_answers_model.h
rename to ash/components/quick_answers/quick_answers_model.h
index 0a72bb8..07220b3 100644
--- a/chromeos/components/quick_answers/quick_answers_model.h
+++ b/ash/components/quick_answers/quick_answers_model.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_MODEL_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_MODEL_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_MODEL_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_MODEL_H_
#include <string>
#include <vector>
@@ -212,4 +212,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_MODEL_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_MODEL_H_
diff --git a/chromeos/components/quick_answers/quick_answers_notice.cc b/ash/components/quick_answers/quick_answers_notice.cc
similarity index 92%
rename from chromeos/components/quick_answers/quick_answers_notice.cc
rename to ash/components/quick_answers/quick_answers_notice.cc
index 21b7c25..b7c2aa6 100644
--- a/chromeos/components/quick_answers/quick_answers_notice.cc
+++ b/ash/components/quick_answers/quick_answers_notice.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/quick_answers_notice.h"
+#include "ash/components/quick_answers/quick_answers_notice.h"
#include <string>
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
+#include "ash/components/quick_answers/utils/quick_answers_metrics.h"
#include "base/metrics/histogram_functions.h"
#include "base/time/time.h"
-#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_metrics.h"
#include "components/prefs/pref_service.h"
namespace chromeos {
diff --git a/chromeos/components/quick_answers/quick_answers_notice.h b/ash/components/quick_answers/quick_answers_notice.h
similarity index 91%
rename from chromeos/components/quick_answers/quick_answers_notice.h
rename to ash/components/quick_answers/quick_answers_notice.h
index a7891af..5a746c72 100644
--- a/chromeos/components/quick_answers/quick_answers_notice.h
+++ b/ash/components/quick_answers/quick_answers_notice.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_NOTICE_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_NOTICE_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_NOTICE_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_NOTICE_H_
#include <memory>
@@ -73,4 +73,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_NOTICE_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_QUICK_ANSWERS_NOTICE_H_
diff --git a/chromeos/components/quick_answers/quick_answers_notice_unittest.cc b/ash/components/quick_answers/quick_answers_notice_unittest.cc
similarity index 93%
rename from chromeos/components/quick_answers/quick_answers_notice_unittest.cc
rename to ash/components/quick_answers/quick_answers_notice_unittest.cc
index 5809b483..ec120dd6 100644
--- a/chromeos/components/quick_answers/quick_answers_notice_unittest.cc
+++ b/ash/components/quick_answers/quick_answers_notice_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/quick_answers_notice.h"
+#include "ash/components/quick_answers/quick_answers_notice.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
+#include "ash/components/quick_answers/quick_answers_model.h"
#include "base/test/task_environment.h"
#include "base/test/test_mock_time_task_runner.h"
-#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
#include "components/prefs/testing_pref_service.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chromeos/components/quick_answers/result_loader.cc b/ash/components/quick_answers/result_loader.cc
similarity index 92%
rename from chromeos/components/quick_answers/result_loader.cc
rename to ash/components/quick_answers/result_loader.cc
index 2263ff7..7f74387e 100644
--- a/chromeos/components/quick_answers/result_loader.cc
+++ b/ash/components/quick_answers/result_loader.cc
@@ -1,14 +1,14 @@
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/result_loader.h"
+#include "ash/components/quick_answers/result_loader.h"
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/search_result_loader.h"
+#include "ash/components/quick_answers/translation_result_loader.h"
+#include "ash/components/quick_answers/utils/quick_answers_metrics.h"
#include "ash/constants/ash_features.h"
#include "base/bind.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/search_result_loader.h"
-#include "chromeos/components/quick_answers/translation_result_loader.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_metrics.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/simple_url_loader.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
diff --git a/chromeos/components/quick_answers/result_loader.h b/ash/components/quick_answers/result_loader.h
similarity index 91%
rename from chromeos/components/quick_answers/result_loader.h
rename to ash/components/quick_answers/result_loader.h
index 31fd797..00f7e40 100644
--- a/chromeos/components/quick_answers/result_loader.h
+++ b/ash/components/quick_answers/result_loader.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_RESULT_LOADER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_RESULT_LOADER_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_RESULT_LOADER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_RESULT_LOADER_H_
#include <memory>
#include <string>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/search_result_parsers/search_response_parser.h"
#include "base/memory/weak_ptr.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/search_result_parsers/search_response_parser.h"
namespace network {
class SimpleURLLoader;
@@ -110,4 +110,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_RESULT_LOADER_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_RESULT_LOADER_H_
diff --git a/chromeos/components/quick_answers/search_result_loader.cc b/ash/components/quick_answers/search_result_loader.cc
similarity index 95%
rename from chromeos/components/quick_answers/search_result_loader.cc
rename to ash/components/quick_answers/search_result_loader.cc
index 28f2195..aac93394 100644
--- a/chromeos/components/quick_answers/search_result_loader.cc
+++ b/ash/components/quick_answers/search_result_loader.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_loader.h"
+#include "ash/components/quick_answers/search_result_loader.h"
#include <utility>
+#include "ash/components/quick_answers/quick_answers_model.h"
#include "base/json/json_writer.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
#include "chromeos/services/assistant/public/shared/constants.h"
#include "net/base/escape.h"
#include "net/base/url_util.h"
diff --git a/chromeos/components/quick_answers/search_result_loader.h b/ash/components/quick_answers/search_result_loader.h
similarity index 77%
rename from chromeos/components/quick_answers/search_result_loader.h
rename to ash/components/quick_answers/search_result_loader.h
index aa4d0bf8..d0ec0b9 100644
--- a/chromeos/components/quick_answers/search_result_loader.h
+++ b/ash/components/quick_answers/search_result_loader.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_LOADER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_LOADER_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_LOADER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_LOADER_H_
#include <memory>
#include <string>
-#include "chromeos/components/quick_answers/result_loader.h"
-#include "chromeos/components/quick_answers/search_result_parsers/search_response_parser.h"
+#include "ash/components/quick_answers/result_loader.h"
+#include "ash/components/quick_answers/search_result_parsers/search_response_parser.h"
namespace network {
namespace mojom {
@@ -44,4 +44,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_LOADER_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_LOADER_H_
diff --git a/chromeos/components/quick_answers/search_result_loader_unittest.cc b/ash/components/quick_answers/search_result_loader_unittest.cc
similarity index 93%
rename from chromeos/components/quick_answers/search_result_loader_unittest.cc
rename to ash/components/quick_answers/search_result_loader_unittest.cc
index 8539560..6dee591 100644
--- a/chromeos/components/quick_answers/search_result_loader_unittest.cc
+++ b/ash/components/quick_answers/search_result_loader_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_loader.h"
+#include "ash/components/quick_answers/search_result_loader.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/test/test_helpers.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "base/test/task_environment.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/test/test_helpers.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
#include "chromeos/services/assistant/public/shared/constants.h"
#include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"
#include "services/network/test/test_url_loader_factory.h"
diff --git a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.cc b/ash/components/quick_answers/search_result_parsers/definition_result_parser.cc
similarity index 95%
rename from chromeos/components/quick_answers/search_result_parsers/definition_result_parser.cc
rename to ash/components/quick_answers/search_result_parsers/definition_result_parser.cc
index 0ed12f8..224f1ce 100644
--- a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.cc
+++ b/ash/components/quick_answers/search_result_parsers/definition_result_parser.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_parsers/definition_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/definition_result_parser.h"
#include <string>
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "ash/constants/ash_features.h"
#include "base/logging.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
#include "url/gurl.h"
namespace chromeos {
diff --git a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.h b/ash/components/quick_answers/search_result_parsers/definition_result_parser.h
similarity index 66%
rename from chromeos/components/quick_answers/search_result_parsers/definition_result_parser.h
rename to ash/components/quick_answers/search_result_parsers/definition_result_parser.h
index 3239ff4..dfb8226 100644
--- a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.h
+++ b/ash/components/quick_answers/search_result_parsers/definition_result_parser.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_DEFINITION_RESULT_PARSER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_DEFINITION_RESULT_PARSER_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_DEFINITION_RESULT_PARSER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_DEFINITION_RESULT_PARSER_H_
-#include "chromeos/components/quick_answers/search_result_parsers/result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/result_parser.h"
namespace base {
class GURL;
@@ -29,4 +29,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_DEFINITION_RESULT_PARSER_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_DEFINITION_RESULT_PARSER_H_
diff --git a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser_unittest.cc b/ash/components/quick_answers/search_result_parsers/definition_result_parser_unittest.cc
similarity index 96%
rename from chromeos/components/quick_answers/search_result_parsers/definition_result_parser_unittest.cc
rename to ash/components/quick_answers/search_result_parsers/definition_result_parser_unittest.cc
index 05c86a5d..6de8d5b 100644
--- a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser_unittest.cc
+++ b/ash/components/quick_answers/search_result_parsers/definition_result_parser_unittest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_parsers/definition_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/definition_result_parser.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/test/test_helpers.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/test/test_helpers.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace chromeos {
diff --git a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.cc b/ash/components/quick_answers/search_result_parsers/kp_entity_result_parser.cc
similarity index 92%
rename from chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.cc
rename to ash/components/quick_answers/search_result_parsers/kp_entity_result_parser.cc
index 0ac0990..2535aec9 100644
--- a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.cc
+++ b/ash/components/quick_answers/search_result_parsers/kp_entity_result_parser.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/kp_entity_result_parser.h"
#include <string>
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
namespace chromeos {
namespace quick_answers {
diff --git a/ash/components/quick_answers/search_result_parsers/kp_entity_result_parser.h b/ash/components/quick_answers/search_result_parsers/kp_entity_result_parser.h
new file mode 100644
index 0000000..e21a34c
--- /dev/null
+++ b/ash/components/quick_answers/search_result_parsers/kp_entity_result_parser.h
@@ -0,0 +1,26 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_KP_ENTITY_RESULT_PARSER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_KP_ENTITY_RESULT_PARSER_H_
+
+#include "ash/components/quick_answers/search_result_parsers/result_parser.h"
+
+namespace base {
+class Value;
+} // namespace base
+
+namespace chromeos {
+namespace quick_answers {
+
+class KpEntityResultParser : public ResultParser {
+ public:
+ // ResultParser:
+ bool Parse(const base::Value* result, QuickAnswer* quick_answer) override;
+};
+
+} // namespace quick_answers
+} // namespace chromeos
+
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_KP_ENTITY_RESULT_PARSER_H_
diff --git a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser_unittest.cc b/ash/components/quick_answers/search_result_parsers/kp_entity_result_parser_unittest.cc
similarity index 96%
rename from chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser_unittest.cc
rename to ash/components/quick_answers/search_result_parsers/kp_entity_result_parser_unittest.cc
index 1208ff6..19d070d 100644
--- a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser_unittest.cc
+++ b/ash/components/quick_answers/search_result_parsers/kp_entity_result_parser_unittest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/kp_entity_result_parser.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/test/test_helpers.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/test/test_helpers.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace chromeos {
diff --git a/chromeos/components/quick_answers/search_result_parsers/result_parser.cc b/ash/components/quick_answers/search_result_parsers/result_parser.cc
similarity index 76%
rename from chromeos/components/quick_answers/search_result_parsers/result_parser.cc
rename to ash/components/quick_answers/search_result_parsers/result_parser.cc
index 79af0e7..0f48487 100644
--- a/chromeos/components/quick_answers/search_result_parsers/result_parser.cc
+++ b/ash/components/quick_answers/search_result_parsers/result_parser.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_parsers/result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/definition_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/kp_entity_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/translation_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h"
#include "base/notreached.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/search_result_parsers/definition_result_parser.h"
-#include "chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.h"
-#include "chromeos/components/quick_answers/search_result_parsers/translation_result_parser.h"
-#include "chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h"
namespace chromeos {
namespace quick_answers {
diff --git a/chromeos/components/quick_answers/search_result_parsers/result_parser.h b/ash/components/quick_answers/search_result_parsers/result_parser.h
similarity index 77%
rename from chromeos/components/quick_answers/search_result_parsers/result_parser.h
rename to ash/components/quick_answers/search_result_parsers/result_parser.h
index 6ae68d5af..490e7f8 100644
--- a/chromeos/components/quick_answers/search_result_parsers/result_parser.h
+++ b/ash/components/quick_answers/search_result_parsers/result_parser.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_RESULT_PARSER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_RESULT_PARSER_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_RESULT_PARSER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_RESULT_PARSER_H_
#include <memory>
#include <string>
-#include "chromeos/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/quick_answers_model.h"
namespace base {
class Value;
@@ -42,4 +42,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_RESULT_PARSER_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_RESULT_PARSER_H_
diff --git a/chromeos/components/quick_answers/search_result_parsers/result_parser_unittest.cc b/ash/components/quick_answers/search_result_parsers/result_parser_unittest.cc
similarity index 87%
rename from chromeos/components/quick_answers/search_result_parsers/result_parser_unittest.cc
rename to ash/components/quick_answers/search_result_parsers/result_parser_unittest.cc
index 1b4c04f..a5634e52 100644
--- a/chromeos/components/quick_answers/search_result_parsers/result_parser_unittest.cc
+++ b/ash/components/quick_answers/search_result_parsers/result_parser_unittest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_parsers/result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/result_parser.h"
#include <memory>
#include <string>
-#include "chromeos/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/quick_answers_model.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace chromeos {
diff --git a/chromeos/components/quick_answers/search_result_parsers/search_response_parser.cc b/ash/components/quick_answers/search_result_parsers/search_response_parser.cc
similarity index 93%
rename from chromeos/components/quick_answers/search_result_parsers/search_response_parser.cc
rename to ash/components/quick_answers/search_result_parsers/search_response_parser.cc
index f0c5681e..f19ece4 100644
--- a/chromeos/components/quick_answers/search_result_parsers/search_response_parser.cc
+++ b/ash/components/quick_answers/search_result_parsers/search_response_parser.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 "chromeos/components/quick_answers/search_result_parsers/search_response_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/search_response_parser.h"
#include <utility>
+#include "ash/components/quick_answers/search_result_parsers/result_parser.h"
#include "base/bind.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/search_result_parsers/result_parser.h"
namespace chromeos {
namespace quick_answers {
diff --git a/chromeos/components/quick_answers/search_result_parsers/search_response_parser.h b/ash/components/quick_answers/search_result_parsers/search_response_parser.h
similarity index 83%
rename from chromeos/components/quick_answers/search_result_parsers/search_response_parser.h
rename to ash/components/quick_answers/search_result_parsers/search_response_parser.h
index 6cf4707..f382787 100644
--- a/chromeos/components/quick_answers/search_result_parsers/search_response_parser.h
+++ b/ash/components/quick_answers/search_result_parsers/search_response_parser.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_SEARCH_RESPONSE_PARSER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_SEARCH_RESPONSE_PARSER_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_SEARCH_RESPONSE_PARSER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_SEARCH_RESPONSE_PARSER_H_
#include <memory>
#include <string>
@@ -49,4 +49,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_SEARCH_RESPONSE_PARSER_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_SEARCH_RESPONSE_PARSER_H_
diff --git a/chromeos/components/quick_answers/search_result_parsers/search_response_parser_unittest.cc b/ash/components/quick_answers/search_result_parsers/search_response_parser_unittest.cc
similarity index 94%
rename from chromeos/components/quick_answers/search_result_parsers/search_response_parser_unittest.cc
rename to ash/components/quick_answers/search_result_parsers/search_response_parser_unittest.cc
index 9ba476b..443e9133 100644
--- a/chromeos/components/quick_answers/search_result_parsers/search_response_parser_unittest.cc
+++ b/ash/components/quick_answers/search_result_parsers/search_response_parser_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_parsers/search_response_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/search_response_parser.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/test/test_helpers.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/test/test_helpers.h"
#include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chromeos/components/quick_answers/search_result_parsers/translation_result_parser.cc b/ash/components/quick_answers/search_result_parsers/translation_result_parser.cc
similarity index 91%
rename from chromeos/components/quick_answers/search_result_parsers/translation_result_parser.cc
rename to ash/components/quick_answers/search_result_parsers/translation_result_parser.cc
index ed263f4..448a47d 100644
--- a/chromeos/components/quick_answers/search_result_parsers/translation_result_parser.cc
+++ b/ash/components/quick_answers/search_result_parsers/translation_result_parser.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 "chromeos/components/quick_answers/search_result_parsers/translation_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/translation_result_parser.h"
#include <string>
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "base/logging.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
namespace chromeos {
namespace quick_answers {
diff --git a/ash/components/quick_answers/search_result_parsers/translation_result_parser.h b/ash/components/quick_answers/search_result_parsers/translation_result_parser.h
new file mode 100644
index 0000000..d061602
--- /dev/null
+++ b/ash/components/quick_answers/search_result_parsers/translation_result_parser.h
@@ -0,0 +1,26 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_TRANSLATION_RESULT_PARSER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_TRANSLATION_RESULT_PARSER_H_
+
+#include "ash/components/quick_answers/search_result_parsers/result_parser.h"
+
+namespace base {
+class Value;
+} // namespace base
+
+namespace chromeos {
+namespace quick_answers {
+
+class TranslationResultParser : public ResultParser {
+ public:
+ // ResultParser:
+ bool Parse(const base::Value* result, QuickAnswer* quick_answer) override;
+};
+
+} // namespace quick_answers
+} // namespace chromeos
+
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_TRANSLATION_RESULT_PARSER_H_
diff --git a/chromeos/components/quick_answers/search_result_parsers/translation_result_parser_unittest.cc b/ash/components/quick_answers/search_result_parsers/translation_result_parser_unittest.cc
similarity index 95%
rename from chromeos/components/quick_answers/search_result_parsers/translation_result_parser_unittest.cc
rename to ash/components/quick_answers/search_result_parsers/translation_result_parser_unittest.cc
index 62f00df..b456877 100644
--- a/chromeos/components/quick_answers/search_result_parsers/translation_result_parser_unittest.cc
+++ b/ash/components/quick_answers/search_result_parsers/translation_result_parser_unittest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_parsers/translation_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/translation_result_parser.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/test/test_helpers.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/test/test_helpers.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace chromeos {
diff --git a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.cc b/ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser.cc
similarity index 86%
rename from chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.cc
rename to ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser.cc
index 424305f..125d62c 100644
--- a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.cc
+++ b/ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h"
#include <string>
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
+#include "ash/components/quick_answers/utils/unit_conversion_constants.h"
+#include "ash/components/quick_answers/utils/unit_converter.h"
#include "base/logging.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
-#include "chromeos/components/quick_answers/utils/unit_conversion_constants.h"
-#include "chromeos/components/quick_answers/utils/unit_converter.h"
namespace chromeos {
namespace quick_answers {
diff --git a/ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h b/ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h
new file mode 100644
index 0000000..dc3e7cb8b
--- /dev/null
+++ b/ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h
@@ -0,0 +1,26 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_UNIT_CONVERSION_RESULT_PARSER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_UNIT_CONVERSION_RESULT_PARSER_H_
+
+#include "ash/components/quick_answers/search_result_parsers/result_parser.h"
+
+namespace base {
+class Value;
+} // namespace base
+
+namespace chromeos {
+namespace quick_answers {
+
+class UnitConversionResultParser : public ResultParser {
+ public:
+ // ResultParser:
+ bool Parse(const base::Value* result, QuickAnswer* quick_answer) override;
+};
+
+} // namespace quick_answers
+} // namespace chromeos
+
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_UNIT_CONVERSION_RESULT_PARSER_H_
diff --git a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser_unittest.cc b/ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser_unittest.cc
similarity index 96%
rename from chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser_unittest.cc
rename to ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser_unittest.cc
index 3b23103..b26352d 100644
--- a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser_unittest.cc
+++ b/ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser_unittest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h"
+#include "ash/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/test/test_helpers.h"
+#include "ash/components/quick_answers/utils/unit_conversion_constants.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/test/test_helpers.h"
-#include "chromeos/components/quick_answers/utils/unit_conversion_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace chromeos {
diff --git a/chromeos/components/quick_answers/test/test_helpers.cc b/ash/components/quick_answers/test/test_helpers.cc
similarity index 93%
rename from chromeos/components/quick_answers/test/test_helpers.cc
rename to ash/components/quick_answers/test/test_helpers.cc
index 67e69d7..a9235ce8 100644
--- a/chromeos/components/quick_answers/test/test_helpers.cc
+++ b/ash/components/quick_answers/test/test_helpers.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/test/test_helpers.h"
+#include "ash/components/quick_answers/test/test_helpers.h"
namespace chromeos {
namespace quick_answers {
diff --git a/chromeos/components/quick_answers/test/test_helpers.h b/ash/components/quick_answers/test/test_helpers.h
similarity index 81%
rename from chromeos/components/quick_answers/test/test_helpers.h
rename to ash/components/quick_answers/test/test_helpers.h
index 63993b33..28a0eb21 100644
--- a/chromeos/components/quick_answers/test/test_helpers.h
+++ b/ash/components/quick_answers/test/test_helpers.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_TEST_TEST_HELPERS_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_TEST_TEST_HELPERS_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_TEST_TEST_HELPERS_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_TEST_TEST_HELPERS_H_
-#include "chromeos/components/quick_answers/quick_answers_client.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/result_loader.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
+#include "ash/components/quick_answers/quick_answers_client.h"
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/result_loader.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace chromeos {
@@ -63,4 +63,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_TEST_TEST_HELPERS_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_TEST_TEST_HELPERS_H_
diff --git a/chromeos/components/quick_answers/translation_response_parser.cc b/ash/components/quick_answers/translation_response_parser.cc
similarity index 90%
rename from chromeos/components/quick_answers/translation_response_parser.cc
rename to ash/components/quick_answers/translation_response_parser.cc
index df76d8d..3e24980 100644
--- a/chromeos/components/quick_answers/translation_response_parser.cc
+++ b/ash/components/quick_answers/translation_response_parser.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/translation_response_parser.h"
+#include "ash/components/quick_answers/translation_response_parser.h"
#include <utility>
+#include "ash/components/quick_answers/search_result_parsers/result_parser.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "base/bind.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/search_result_parsers/result_parser.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
namespace chromeos {
namespace quick_answers {
diff --git a/chromeos/components/quick_answers/translation_response_parser.h b/ash/components/quick_answers/translation_response_parser.h
similarity index 87%
rename from chromeos/components/quick_answers/translation_response_parser.h
rename to ash/components/quick_answers/translation_response_parser.h
index e519346..8ebbaf22 100644
--- a/chromeos/components/quick_answers/translation_response_parser.h
+++ b/ash/components/quick_answers/translation_response_parser.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESPONSE_PARSER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESPONSE_PARSER_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESPONSE_PARSER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESPONSE_PARSER_H_
#include <memory>
#include <string>
@@ -50,4 +50,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESPONSE_PARSER_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESPONSE_PARSER_H_
diff --git a/chromeos/components/quick_answers/translation_response_parser_unittest.cc b/ash/components/quick_answers/translation_response_parser_unittest.cc
similarity index 94%
rename from chromeos/components/quick_answers/translation_response_parser_unittest.cc
rename to ash/components/quick_answers/translation_response_parser_unittest.cc
index 7d85005a..f546a63 100644
--- a/chromeos/components/quick_answers/translation_response_parser_unittest.cc
+++ b/ash/components/quick_answers/translation_response_parser_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/translation_response_parser.h"
+#include "ash/components/quick_answers/translation_response_parser.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/test/test_helpers.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/test/test_helpers.h"
#include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chromeos/components/quick_answers/translation_result_loader.cc b/ash/components/quick_answers/translation_result_loader.cc
similarity index 94%
rename from chromeos/components/quick_answers/translation_result_loader.cc
rename to ash/components/quick_answers/translation_result_loader.cc
index f8e211c..7f1dd3ad 100644
--- a/chromeos/components/quick_answers/translation_result_loader.cc
+++ b/ash/components/quick_answers/translation_result_loader.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/translation_result_loader.h"
+#include "ash/components/quick_answers/translation_result_loader.h"
#include <utility>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "ash/public/cpp/quick_answers/controller/quick_answers_browser_client.h"
#include "base/json/json_writer.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
#include "chromeos/services/assistant/public/shared/constants.h"
#include "net/base/escape.h"
#include "net/base/url_util.h"
diff --git a/chromeos/components/quick_answers/translation_result_loader.h b/ash/components/quick_answers/translation_result_loader.h
similarity index 80%
rename from chromeos/components/quick_answers/translation_result_loader.h
rename to ash/components/quick_answers/translation_result_loader.h
index 829f91f8..5c2ef54 100644
--- a/chromeos/components/quick_answers/translation_result_loader.h
+++ b/ash/components/quick_answers/translation_result_loader.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESULT_LOADER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESULT_LOADER_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESULT_LOADER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESULT_LOADER_H_
#include <memory>
#include <string>
-#include "chromeos/components/quick_answers/result_loader.h"
-#include "chromeos/components/quick_answers/translation_response_parser.h"
+#include "ash/components/quick_answers/result_loader.h"
+#include "ash/components/quick_answers/translation_response_parser.h"
namespace network {
namespace mojom {
@@ -49,4 +49,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESULT_LOADER_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_TRANSLATION_RESULT_LOADER_H_
diff --git a/chromeos/components/quick_answers/translation_result_loader_unittest.cc b/ash/components/quick_answers/translation_result_loader_unittest.cc
similarity index 93%
rename from chromeos/components/quick_answers/translation_result_loader_unittest.cc
rename to ash/components/quick_answers/translation_result_loader_unittest.cc
index b31c69d..5f8cac76 100644
--- a/chromeos/components/quick_answers/translation_result_loader_unittest.cc
+++ b/ash/components/quick_answers/translation_result_loader_unittest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/translation_result_loader.h"
+#include "ash/components/quick_answers/translation_result_loader.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/test/test_helpers.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "ash/public/cpp/quick_answers/controller/quick_answers_browser_client.h"
#include "base/test/task_environment.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/test/test_helpers.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
#include "chromeos/services/assistant/public/shared/constants.h"
#include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
diff --git a/chromeos/components/quick_answers/understanding/intent_generator.cc b/ash/components/quick_answers/understanding/intent_generator.cc
similarity index 97%
rename from chromeos/components/quick_answers/understanding/intent_generator.cc
rename to ash/components/quick_answers/understanding/intent_generator.cc
index 6d9af17e..9fb0b96 100644
--- a/chromeos/components/quick_answers/understanding/intent_generator.cc
+++ b/ash/components/quick_answers/understanding/intent_generator.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/understanding/intent_generator.h"
+#include "ash/components/quick_answers/understanding/intent_generator.h"
#include <map>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "ash/constants/ash_features.h"
#include "ash/public/cpp/quick_answers/quick_answers_state.h"
#include "base/i18n/case_conversion.h"
#include "base/no_destructor.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
#include "chromeos/services/machine_learning/public/cpp/service_connection.h"
#include "chromeos/services/machine_learning/public/mojom/machine_learning_service.mojom.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chromeos/components/quick_answers/understanding/intent_generator.h b/ash/components/quick_answers/understanding/intent_generator.h
similarity index 88%
rename from chromeos/components/quick_answers/understanding/intent_generator.h
rename to ash/components/quick_answers/understanding/intent_generator.h
index 3f63f36..4aff5a19 100644
--- a/chromeos/components/quick_answers/understanding/intent_generator.h
+++ b/ash/components/quick_answers/understanding/intent_generator.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_UNDERSTANDING_INTENT_GENERATOR_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_UNDERSTANDING_INTENT_GENERATOR_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_UNDERSTANDING_INTENT_GENERATOR_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_UNDERSTANDING_INTENT_GENERATOR_H_
#include <memory>
#include <string>
+#include "ash/components/quick_answers/utils/language_detector.h"
#include "base/callback.h"
-#include "chromeos/components/quick_answers/utils/language_detector.h"
#include "chromeos/services/machine_learning/public/mojom/machine_learning_service.mojom.h"
#include "chromeos/services/machine_learning/public/mojom/text_classifier.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -72,4 +72,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_UNDERSTANDING_INTENT_GENERATOR_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_UNDERSTANDING_INTENT_GENERATOR_H_
diff --git a/chromeos/components/quick_answers/understanding/intent_generator_unittest.cc b/ash/components/quick_answers/understanding/intent_generator_unittest.cc
similarity index 98%
rename from chromeos/components/quick_answers/understanding/intent_generator_unittest.cc
rename to ash/components/quick_answers/understanding/intent_generator_unittest.cc
index f10c8ea..2ad9c50 100644
--- a/chromeos/components/quick_answers/understanding/intent_generator_unittest.cc
+++ b/ash/components/quick_answers/understanding/intent_generator_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 "chromeos/components/quick_answers/understanding/intent_generator.h"
+#include "ash/components/quick_answers/understanding/intent_generator.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "ash/constants/ash_features.h"
#include "base/bind.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
#include "chromeos/services/machine_learning/public/cpp/fake_service_connection.h"
#include "chromeos/services/machine_learning/public/mojom/machine_learning_service.mojom.h"
#include "chromeos/services/machine_learning/public/mojom/text_classifier.mojom.h"
diff --git a/chromeos/components/quick_answers/utils/language_detector.cc b/ash/components/quick_answers/utils/language_detector.cc
similarity index 97%
rename from chromeos/components/quick_answers/utils/language_detector.cc
rename to ash/components/quick_answers/utils/language_detector.cc
index de4dd77..63417b1 100644
--- a/chromeos/components/quick_answers/utils/language_detector.cc
+++ b/ash/components/quick_answers/utils/language_detector.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/utils/language_detector.h"
+#include "ash/components/quick_answers/utils/language_detector.h"
#include "ash/constants/ash_features.h"
#include "base/callback.h"
diff --git a/chromeos/components/quick_answers/utils/language_detector.h b/ash/components/quick_answers/utils/language_detector.h
similarity index 89%
rename from chromeos/components/quick_answers/utils/language_detector.h
rename to ash/components/quick_answers/utils/language_detector.h
index 0299eb9..e31914f 100644
--- a/chromeos/components/quick_answers/utils/language_detector.h
+++ b/ash/components/quick_answers/utils/language_detector.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_LANGUAGE_DETECTOR_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_LANGUAGE_DETECTOR_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_UTILS_LANGUAGE_DETECTOR_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_UTILS_LANGUAGE_DETECTOR_H_
#include <memory>
#include <string>
@@ -57,4 +57,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_LANGUAGE_DETECTOR_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_UTILS_LANGUAGE_DETECTOR_H_
diff --git a/chromeos/components/quick_answers/utils/language_detector_unittest.cc b/ash/components/quick_answers/utils/language_detector_unittest.cc
similarity index 96%
rename from chromeos/components/quick_answers/utils/language_detector_unittest.cc
rename to ash/components/quick_answers/utils/language_detector_unittest.cc
index bc01df5c..d6054cd2 100644
--- a/chromeos/components/quick_answers/utils/language_detector_unittest.cc
+++ b/ash/components/quick_answers/utils/language_detector_unittest.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/utils/language_detector.h"
+#include "ash/components/quick_answers/utils/language_detector.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include "ash/constants/ash_features.h"
#include "base/bind.h"
#include "base/run_loop.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/task_environment.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
#include "chromeos/services/machine_learning/public/mojom/machine_learning_service.mojom.h"
#include "chromeos/services/machine_learning/public/mojom/text_classifier.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chromeos/components/quick_answers/utils/quick_answers_metrics.cc b/ash/components/quick_answers/utils/quick_answers_metrics.cc
similarity index 97%
rename from chromeos/components/quick_answers/utils/quick_answers_metrics.cc
rename to ash/components/quick_answers/utils/quick_answers_metrics.cc
index f4c0b219..d45bd237 100644
--- a/chromeos/components/quick_answers/utils/quick_answers_metrics.cc
+++ b/ash/components/quick_answers/utils/quick_answers_metrics.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/utils/quick_answers_metrics.h"
+#include "ash/components/quick_answers/utils/quick_answers_metrics.h"
+#include "ash/components/quick_answers/quick_answers_notice.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
-#include "chromeos/components/quick_answers/quick_answers_notice.h"
namespace chromeos {
namespace quick_answers {
diff --git a/chromeos/components/quick_answers/utils/quick_answers_metrics.h b/ash/components/quick_answers/utils/quick_answers_metrics.h
similarity index 86%
rename from chromeos/components/quick_answers/utils/quick_answers_metrics.h
rename to ash/components/quick_answers/utils/quick_answers_metrics.h
index 6147bb7..3c8a519 100644
--- a/chromeos/components/quick_answers/utils/quick_answers_metrics.h
+++ b/ash/components/quick_answers/utils/quick_answers_metrics.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_METRICS_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_METRICS_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_METRICS_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_METRICS_H_
-#include "chromeos/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/quick_answers_model.h"
namespace base {
@@ -55,4 +55,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_METRICS_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_METRICS_H_
diff --git a/chromeos/components/quick_answers/utils/quick_answers_utils.cc b/ash/components/quick_answers/utils/quick_answers_utils.cc
similarity index 97%
rename from chromeos/components/quick_answers/utils/quick_answers_utils.cc
rename to ash/components/quick_answers/utils/quick_answers_utils.cc
index e4e8548..2d714b01 100644
--- a/chromeos/components/quick_answers/utils/quick_answers_utils.cc
+++ b/ash/components/quick_answers/utils/quick_answers_utils.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
#include <string>
diff --git a/chromeos/components/quick_answers/utils/quick_answers_utils.h b/ash/components/quick_answers/utils/quick_answers_utils.h
similarity index 85%
rename from chromeos/components/quick_answers/utils/quick_answers_utils.h
rename to ash/components/quick_answers/utils/quick_answers_utils.h
index d3e4555d..b059900 100644
--- a/chromeos/components/quick_answers/utils/quick_answers_utils.h
+++ b/ash/components/quick_answers/utils/quick_answers_utils.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_UTILS_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_UTILS_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_UTILS_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_UTILS_H_
-#include "chromeos/components/quick_answers/quick_answers_model.h"
+#include "ash/components/quick_answers/quick_answers_model.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
namespace chromeos {
@@ -44,4 +44,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_UTILS_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_UTILS_QUICK_ANSWERS_UTILS_H_
diff --git a/chromeos/components/quick_answers/utils/unit_conversion_constants.cc b/ash/components/quick_answers/utils/unit_conversion_constants.cc
similarity index 94%
rename from chromeos/components/quick_answers/utils/unit_conversion_constants.cc
rename to ash/components/quick_answers/utils/unit_conversion_constants.cc
index 827c7989..2963efea 100644
--- a/chromeos/components/quick_answers/utils/unit_conversion_constants.cc
+++ b/ash/components/quick_answers/utils/unit_conversion_constants.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/utils/unit_conversion_constants.h"
+#include "ash/components/quick_answers/utils/unit_conversion_constants.h"
#include "base/containers/fixed_flat_map.h"
#include "base/strings/string_piece.h"
diff --git a/chromeos/components/quick_answers/utils/unit_conversion_constants.h b/ash/components/quick_answers/utils/unit_conversion_constants.h
similarity index 75%
rename from chromeos/components/quick_answers/utils/unit_conversion_constants.h
rename to ash/components/quick_answers/utils/unit_conversion_constants.h
index e026dcd..8ebdcfb 100644
--- a/chromeos/components/quick_answers/utils/unit_conversion_constants.h
+++ b/ash/components/quick_answers/utils/unit_conversion_constants.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERSION_CONSTANTS_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERSION_CONSTANTS_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERSION_CONSTANTS_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERSION_CONSTANTS_H_
#include <string>
@@ -27,4 +27,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERSION_CONSTANTS_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERSION_CONSTANTS_H_
diff --git a/chromeos/components/quick_answers/utils/unit_converter.cc b/ash/components/quick_answers/utils/unit_converter.cc
similarity index 93%
rename from chromeos/components/quick_answers/utils/unit_converter.cc
rename to ash/components/quick_answers/utils/unit_converter.cc
index 73970e9..22f7b49 100644
--- a/chromeos/components/quick_answers/utils/unit_converter.cc
+++ b/ash/components/quick_answers/utils/unit_converter.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/utils/unit_converter.h"
+#include "ash/components/quick_answers/utils/unit_converter.h"
#include <algorithm>
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
+#include "ash/components/quick_answers/utils/unit_conversion_constants.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
-#include "chromeos/components/quick_answers/utils/unit_conversion_constants.h"
namespace chromeos {
namespace quick_answers {
diff --git a/chromeos/components/quick_answers/utils/unit_converter.h b/ash/components/quick_answers/utils/unit_converter.h
similarity index 87%
rename from chromeos/components/quick_answers/utils/unit_converter.h
rename to ash/components/quick_answers/utils/unit_converter.h
index 6f72291d..6bf415b 100644
--- a/chromeos/components/quick_answers/utils/unit_converter.h
+++ b/ash/components/quick_answers/utils/unit_converter.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERTER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERTER_H_
+#ifndef ASH_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERTER_H_
+#define ASH_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERTER_H_
#include <string>
@@ -48,4 +48,4 @@
} // namespace quick_answers
} // namespace chromeos
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERTER_H_
+#endif // ASH_COMPONENTS_QUICK_ANSWERS_UTILS_UNIT_CONVERTER_H_
diff --git a/chromeos/components/quick_answers/utils/unit_converter_unittest.cc b/ash/components/quick_answers/utils/unit_converter_unittest.cc
similarity index 97%
rename from chromeos/components/quick_answers/utils/unit_converter_unittest.cc
rename to ash/components/quick_answers/utils/unit_converter_unittest.cc
index 20780f2..8aa25cc1 100644
--- a/chromeos/components/quick_answers/utils/unit_converter_unittest.cc
+++ b/ash/components/quick_answers/utils/unit_converter_unittest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/components/quick_answers/utils/unit_converter.h"
+#include "ash/components/quick_answers/utils/unit_converter.h"
#include <memory>
#include <string>
+#include "ash/components/quick_answers/utils/quick_answers_utils.h"
+#include "ash/components/quick_answers/utils/unit_conversion_constants.h"
#include "ash/constants/ash_features.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
-#include "chromeos/components/quick_answers/utils/quick_answers_utils.h"
-#include "chromeos/components/quick_answers/utils/unit_conversion_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace chromeos {
diff --git a/ash/public/cpp/BUILD.gn b/ash/public/cpp/BUILD.gn
index 146723e..90cddf07 100644
--- a/ash/public/cpp/BUILD.gn
+++ b/ash/public/cpp/BUILD.gn
@@ -342,10 +342,10 @@
]
deps = [
+ "//ash/components/quick_answers/public/cpp:prefs",
"//ash/constants",
"//ash/public/cpp/ambient/proto",
"//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",
diff --git a/ash/public/cpp/quick_answers/quick_answers_state.h b/ash/public/cpp/quick_answers/quick_answers_state.h
index 11397e8..6ee541c 100644
--- a/ash/public/cpp/quick_answers/quick_answers_state.h
+++ b/ash/public/cpp/quick_answers/quick_answers_state.h
@@ -8,13 +8,13 @@
#include <memory>
#include <string>
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "ash/public/cpp/ash_public_export.h"
#include "ash/public/cpp/assistant/assistant_state.h"
#include "base/macros.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;
diff --git a/ash/quick_answers/quick_answers_controller_impl.cc b/ash/quick_answers/quick_answers_controller_impl.cc
index 754b5b1..737a6cee 100644
--- a/ash/quick_answers/quick_answers_controller_impl.cc
+++ b/ash/quick_answers/quick_answers_controller_impl.cc
@@ -4,6 +4,8 @@
#include "ash/quick_answers/quick_answers_controller_impl.h"
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
+#include "ash/components/quick_answers/quick_answers_notice.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"
@@ -12,8 +14,6 @@
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/metrics/histogram_functions.h"
-#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
-#include "chromeos/components/quick_answers/quick_answers_notice.h"
#include "components/prefs/pref_service.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"
diff --git a/ash/quick_answers/quick_answers_controller_impl.h b/ash/quick_answers/quick_answers_controller_impl.h
index 6f401b9..bc08bc4d2 100644
--- a/ash/quick_answers/quick_answers_controller_impl.h
+++ b/ash/quick_answers/quick_answers_controller_impl.h
@@ -9,10 +9,10 @@
#include <string>
#include "ash/ash_export.h"
+#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 "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 chromeos {
diff --git a/ash/quick_answers/quick_answers_controller_unittest.cc b/ash/quick_answers/quick_answers_controller_unittest.cc
index fb99a4c6..ab3a43b 100644
--- a/ash/quick_answers/quick_answers_controller_unittest.cc
+++ b/ash/quick_answers/quick_answers_controller_unittest.cc
@@ -4,6 +4,8 @@
#include "ash/quick_answers/quick_answers_controller_impl.h"
+#include "ash/components/quick_answers/quick_answers_client.h"
+#include "ash/components/quick_answers/quick_answers_notice.h"
#include "ash/constants/ash_features.h"
#include "ash/public/cpp/quick_answers/quick_answers_state.h"
#include "ash/quick_answers/quick_answers_ui_controller.h"
@@ -11,8 +13,6 @@
#include "ash/quick_answers/ui/user_notice_view.h"
#include "ash/test/ash_test_base.h"
#include "base/test/scoped_feature_list.h"
-#include "chromeos/components/quick_answers/quick_answers_client.h"
-#include "chromeos/components/quick_answers/quick_answers_notice.h"
#include "services/network/test/test_url_loader_factory.h"
namespace ash {
diff --git a/ash/quick_answers/quick_answers_ui_controller.cc b/ash/quick_answers/quick_answers_ui_controller.cc
index 6690247a..6829aa2 100644
--- a/ash/quick_answers/quick_answers_ui_controller.cc
+++ b/ash/quick_answers/quick_answers_ui_controller.cc
@@ -4,6 +4,7 @@
#include "ash/quick_answers/quick_answers_ui_controller.h"
+#include "ash/components/quick_answers/quick_answers_model.h"
#include "ash/constants/ash_features.h"
#include "ash/public/cpp/assistant/controller/assistant_interaction_controller.h"
#include "ash/public/cpp/new_window_delegate.h"
@@ -15,7 +16,6 @@
#include "ash/strings/grit/ash_strings.h"
#include "base/bind.h"
#include "base/strings/stringprintf.h"
-#include "chromeos/components/quick_answers/quick_answers_model.h"
#include "chromeos/services/assistant/public/cpp/assistant_service.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "net/base/escape.h"
diff --git a/ash/quick_answers/ui/quick_answers_view.cc b/ash/quick_answers/ui/quick_answers_view.cc
index 3b800bc..4c760eb 100644
--- a/ash/quick_answers/ui/quick_answers_view.cc
+++ b/ash/quick_answers/ui/quick_answers_view.cc
@@ -4,6 +4,7 @@
#include "ash/quick_answers/ui/quick_answers_view.h"
+#include "ash/components/quick_answers/quick_answers_model.h"
#include "ash/constants/ash_features.h"
#include "ash/public/cpp/app_list/vector_icons/vector_icons.h"
#include "ash/public/cpp/assistant/assistant_interface_binder.h"
@@ -14,7 +15,6 @@
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/bind.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"
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 6a5eb37..0256bcb2 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2397,6 +2397,7 @@
]
deps += [
"//ash/components/audio",
+ "//ash/components/quick_answers/public/cpp:prefs",
"//ash/constants",
"//ash/webui/diagnostics_ui",
"//ash/webui/diagnostics_ui/mojom",
@@ -2439,7 +2440,6 @@
"//chromeos/components/personalization_app/mojom",
"//chromeos/components/print_management",
"//chromeos/components/print_management/mojom",
- "//chromeos/components/quick_answers/public/cpp:prefs",
"//chromeos/dbus/attestation",
"//chromeos/dbus/attestation:attestation_proto",
"//chromeos/dbus/cros_disks",
@@ -4738,6 +4738,7 @@
deps += [
"//ash",
"//ash/components/account_manager",
+ "//ash/components/quick_answers",
"//ash/public/cpp",
"//ash/public/cpp/external_arc",
"//build:chromeos_buildflags",
@@ -4764,7 +4765,6 @@
"//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",
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index 498ec36..0f8d938 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -84,6 +84,7 @@
"//ash/components/enhanced_network_tts/mojom",
"//ash/components/pcie_peripheral",
"//ash/components/power",
+ "//ash/components/quick_answers/public/cpp:prefs",
"//ash/constants",
"//ash/public/cpp",
"//ash/public/cpp/external_arc",
@@ -168,7 +169,6 @@
"//chromeos/components/print_management/mojom",
"//chromeos/components/projector_app",
"//chromeos/components/proximity_auth",
- "//chromeos/components/quick_answers/public/cpp:prefs",
"//chromeos/components/remote_apps/mojom",
"//chromeos/components/sensors",
"//chromeos/components/sensors:buildflags",
diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
index bb77ca9..237864d19 100644
--- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
@@ -12,6 +12,7 @@
#include <sstream>
#include <utility>
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "ash/constants/app_types.h"
#include "ash/constants/ash_pref_names.h"
#include "ash/public/cpp/accelerators.h"
@@ -120,7 +121,6 @@
#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"
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 28a1d7e..9a34731 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1090,6 +1090,7 @@
deps += [
"//ash",
"//ash/components/enhanced_network_tts/mojom",
+ "//ash/components/quick_answers/public/cpp:prefs",
"//ash/constants",
"//ash/keyboard/ui:resources_grit_grit",
"//ash/public/cpp",
@@ -1104,7 +1105,6 @@
"//chromeos/components/camera_app_ui/resources:chrome_camera_app",
"//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",
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index 6c4aa68..30822e4 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -58,6 +58,7 @@
#include "extensions/common/extension.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "ash/constants/ash_pref_names.h"
#include "ash/constants/ash_pref_names.h" // nogncheck
#include "ash/public/cpp/ambient/ambient_prefs.h"
@@ -74,7 +75,6 @@
#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 "chromeos/settings/cros_settings_names.h"
#include "components/account_manager_core/pref_names.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index bc68e98f..86a88c4 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -266,6 +266,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/components/audio/audio_devices_pref_handler_impl.h"
+#include "ash/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "ash/constants/ash_pref_names.h"
#include "ash/public/cpp/ash_prefs.h"
#include "chrome/browser/apps/app_service/app_platform_metrics_service.h"
@@ -362,7 +363,6 @@
#include "chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h"
#include "chrome/browser/upgrade_detector/upgrade_detector_chromeos.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"
diff --git a/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc b/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc
index 1a69e06..9efd21b7 100644
--- a/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc
+++ b/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "ash/components/quick_answers/quick_answers_model.h"
#include "ash/constants/ash_features.h"
#include "ash/public/cpp/assistant/controller/assistant_interaction_controller.h"
#include "ash/public/cpp/quick_answers/controller/quick_answers_controller.h"
@@ -19,7 +20,6 @@
#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"
diff --git a/chrome/browser/renderer_context_menu/quick_answers_menu_observer.h b/chrome/browser/renderer_context_menu/quick_answers_menu_observer.h
index cadd1b7f..7ce3f6d 100644
--- a/chrome/browser/renderer_context_menu/quick_answers_menu_observer.h
+++ b/chrome/browser/renderer_context_menu/quick_answers_menu_observer.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
+#include "ash/components/quick_answers/quick_answers_client.h"
#include "base/time/time.h"
-#include "chromeos/components/quick_answers/quick_answers_client.h"
#include "components/renderer_context_menu/render_view_context_menu_observer.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 3a6df6b..bf118f5 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2749,6 +2749,7 @@
"//ash/components/drivefs",
"//ash/components/drivefs/mojom:mojom",
"//ash/components/pcie_peripheral",
+ "//ash/components/quick_answers",
"//ash/constants",
"//ash/keyboard/ui",
"//ash/public/cpp",
@@ -2823,7 +2824,6 @@
"//chromeos/components/print_management",
"//chromeos/components/projector_app",
"//chromeos/components/proximity_auth",
- "//chromeos/components/quick_answers",
"//chromeos/components/string_matching",
"//chromeos/components/tether",
"//chromeos/components/web_applications",
diff --git a/chromeos/components/BUILD.gn b/chromeos/components/BUILD.gn
index e376c6c..0f2fecf 100644
--- a/chromeos/components/BUILD.gn
+++ b/chromeos/components/BUILD.gn
@@ -34,7 +34,6 @@
"//chromeos/components/phonehub:unit_tests",
"//chromeos/components/projector_app:unit_tests",
"//chromeos/components/proximity_auth:unit_tests",
- "//chromeos/components/quick_answers:unit_tests",
"//chromeos/components/sensors:unit_tests",
"//chromeos/components/smbfs:unit_tests",
"//chromeos/components/string_matching:unit_tests",
diff --git a/chromeos/components/quick_answers/DEPS b/chromeos/components/quick_answers/DEPS
deleted file mode 100644
index ae11ac2..0000000
--- a/chromeos/components/quick_answers/DEPS
+++ /dev/null
@@ -1,8 +0,0 @@
-include_rules = [
- "+ash/public",
- "+services/data_decoder/public",
- "+third_party/cld_3/src/src/nnet_language_identifier.h",
- "+ui/base/l10n",
- "+ui/base/resource/resource_bundle.h",
- "+ui/gfx",
-]
diff --git a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.h b/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.h
deleted file mode 100644
index 0afee68..0000000
--- a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_KP_ENTITY_RESULT_PARSER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_KP_ENTITY_RESULT_PARSER_H_
-
-#include "chromeos/components/quick_answers/search_result_parsers/result_parser.h"
-
-namespace base {
-class Value;
-} // namespace base
-
-namespace chromeos {
-namespace quick_answers {
-
-class KpEntityResultParser : public ResultParser {
- public:
- // ResultParser:
- bool Parse(const base::Value* result, QuickAnswer* quick_answer) override;
-};
-
-} // namespace quick_answers
-} // namespace chromeos
-
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_KP_ENTITY_RESULT_PARSER_H_
diff --git a/chromeos/components/quick_answers/search_result_parsers/translation_result_parser.h b/chromeos/components/quick_answers/search_result_parsers/translation_result_parser.h
deleted file mode 100644
index b54008d9..0000000
--- a/chromeos/components/quick_answers/search_result_parsers/translation_result_parser.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_TRANSLATION_RESULT_PARSER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_TRANSLATION_RESULT_PARSER_H_
-
-#include "chromeos/components/quick_answers/search_result_parsers/result_parser.h"
-
-namespace base {
-class Value;
-} // namespace base
-
-namespace chromeos {
-namespace quick_answers {
-
-class TranslationResultParser : public ResultParser {
- public:
- // ResultParser:
- bool Parse(const base::Value* result, QuickAnswer* quick_answer) override;
-};
-
-} // namespace quick_answers
-} // namespace chromeos
-
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_TRANSLATION_RESULT_PARSER_H_
diff --git a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h b/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h
deleted file mode 100644
index fc59891..0000000
--- a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_UNIT_CONVERSION_RESULT_PARSER_H_
-#define CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_UNIT_CONVERSION_RESULT_PARSER_H_
-
-#include "chromeos/components/quick_answers/search_result_parsers/result_parser.h"
-
-namespace base {
-class Value;
-} // namespace base
-
-namespace chromeos {
-namespace quick_answers {
-
-class UnitConversionResultParser : public ResultParser {
- public:
- // ResultParser:
- bool Parse(const base::Value* result, QuickAnswer* quick_answer) override;
-};
-
-} // namespace quick_answers
-} // namespace chromeos
-
-#endif // CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_UNIT_CONVERSION_RESULT_PARSER_H_
