Move Libassistant V1 API to public folder

These APIs are temporary shared between //chromeos/services/assistant
and //chromeos/services/libassistant.
To make this clear I've introduced a
//chromeos/services/assistant/public/cpp/migration folder where those
APIs can reside while they are used by both services.

Bug: b/171748795
Test: compiled
Change-Id: If0f0d3055b4d39894c0cdf15e6e07cb79c446263
Cq-Include-Trybots: luci.chrome.try:linux-chromeos-chrome
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2552998
Commit-Queue: Jeroen Dhollander <jeroendh@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830273}

chromeos/services/assistant/BUILD.gn

@@ -112,13 +112,14 @@ component("lib") {
 
     deps += [
       ":buildflags",
-      ":cros_libassistant",
       "//chromeos/assistant/internal",
       "//chromeos/assistant/internal:libassistant",
       "//chromeos/assistant/internal/proto/google3",
       "//chromeos/dbus",
       "//chromeos/resources",
       "//chromeos/services/assistant/proxy",
+      "//chromeos/services/assistant/public/cpp/migration",
+      "//chromeos/services/assistant/public/cpp/migration",
       "//chromeos/services/network_config/public/mojom",
       "//chromeos/strings",
       "//libassistant/shared/internal_api:fuchsia_api_helper",
@@ -136,25 +137,6 @@ component("lib") {
   }
 }
 
-# This source_set contains the border APIs that interact with Libassistant.
-# TODO(b/171748795): During the migration to a Libassistant mojom service,
-# these APIs are used both by the mojom service and from this directory.
-# Once the migration is complete these should no longer be used here and
-# everything should have been moved to the mojom service.
-
-if (enable_cros_libassistant) {
-  source_set("cros_libassistant") {
-    sources = [
-      "assistant_manager_service_delegate.h",
-      "cros_platform_api.h",
-    ]
-    deps = [
-      "//base",
-      "//libassistant/shared/public",
-    ]
-  }
-}
-
 source_set("tests") {
   testonly = true
   deps = [
@@ -201,10 +183,6 @@ source_set("tests") {
       "platform/network_provider_impl_unittest.cc",
       "platform/power_manager_provider_impl_unittest.cc",
       "platform/system_provider_impl_unittest.cc",
-      "test_support/fake_assistant_manager_service_delegate.cc",
-      "test_support/fake_assistant_manager_service_delegate.h",
-      "test_support/fake_platform_api.cc",
-      "test_support/fake_platform_api.h",
       "test_support/fake_service_context.cc",
       "test_support/fake_service_context.h",
       "test_support/mock_media_manager.cc",
@@ -217,7 +195,8 @@ source_set("tests") {
       "//chromeos/assistant/internal:tests",
       "//chromeos/assistant/internal/proto/google3",
       "//chromeos/dbus",
-      "//chromeos/services/assistant:cros_libassistant",
+      "//chromeos/services/assistant/public/cpp/migration",
+      "//chromeos/services/assistant/public/cpp/migration:test_support",
       "//chromeos/services/network_config/public/mojom",
       "//services/audio/public/cpp:test_support",
       "//services/device/public/cpp:test_support",

chromeos/services/assistant/assistant_device_settings_delegate.cc

@@ -13,9 +13,9 @@
 #include "base/memory/weak_ptr.h"
 #include "chromeos/assistant/internal/internal_util.h"
 #include "chromeos/assistant/internal/proto/google3/assistant/api/client_op/device_args.pb.h"
-#include "chromeos/services/assistant/cros_platform_api.h"
 #include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "chromeos/services/assistant/public/cpp/device_actions.h"
+#include "chromeos/services/assistant/public/cpp/migration/cros_platform_api.h"
 #include "chromeos/services/assistant/service_context.h"
 #include "libassistant/shared/public/platform_audio_output.h"
 

chromeos/services/assistant/assistant_manager_service_delegate_impl.h

@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include "chromeos/services/assistant/assistant_manager_service_delegate.h"
+#include "chromeos/services/assistant/public/cpp/migration/assistant_manager_service_delegate.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "services/device/public/mojom/battery_monitor.mojom.h"
 

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -32,14 +32,14 @@
 #include "chromeos/constants/chromeos_switches.h"
 #include "chromeos/dbus/util/version_loader.h"
 #include "chromeos/services/assistant/assistant_device_settings_delegate.h"
-#include "chromeos/services/assistant/assistant_manager_service_delegate.h"
 #include "chromeos/services/assistant/media_session/assistant_media_session.h"
 #include "chromeos/services/assistant/platform_api_impl.h"
 #include "chromeos/services/assistant/proxy/service_controller.h"
 #include "chromeos/services/assistant/public/cpp/assistant_client.h"
 #include "chromeos/services/assistant/public/cpp/device_actions.h"
 #include "chromeos/services/assistant/public/cpp/features.h"
-#include "chromeos/services/assistant/public/cpp/libassistant_v1_api.h"
+#include "chromeos/services/assistant/public/cpp/migration/assistant_manager_service_delegate.h"
+#include "chromeos/services/assistant/public/cpp/migration/libassistant_v1_api.h"
 #include "chromeos/services/assistant/public/shared/utils.h"
 #include "chromeos/services/assistant/service_context.h"
 #include "chromeos/services/assistant/utils.h"

chromeos/services/assistant/assistant_manager_service_impl_unittest.cc

@@ -21,8 +21,8 @@
 #include "chromeos/services/assistant/assistant_manager_service.h"
 #include "chromeos/services/assistant/public/cpp/assistant_service.h"
 #include "chromeos/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.h"
 #include "chromeos/services/assistant/service_context.h"
-#include "chromeos/services/assistant/test_support/fake_assistant_manager_service_delegate.h"
 #include "chromeos/services/assistant/test_support/fake_service_context.h"
 #include "chromeos/services/assistant/test_support/fully_initialized_assistant_state.h"
 #include "chromeos/services/assistant/test_support/mock_assistant_interaction_subscriber.h"

chromeos/services/assistant/assistant_settings_impl.cc

@@ -12,8 +12,8 @@
 #include "base/callback_helpers.h"
 #include "chromeos/dbus/util/version_loader.h"
 #include "chromeos/services/assistant/assistant_manager_service_impl.h"
-#include "chromeos/services/assistant/cros_platform_api.h"
 #include "chromeos/services/assistant/public/cpp/features.h"
+#include "chromeos/services/assistant/public/cpp/migration/cros_platform_api.h"
 #include "chromeos/services/assistant/public/proto/assistant_device_settings_ui.pb.h"
 #include "chromeos/services/assistant/public/proto/settings_ui.pb.h"
 #include "chromeos/services/assistant/service_context.h"

chromeos/services/assistant/platform_api_impl.h

@@ -11,13 +11,13 @@
 #include <vector>
 
 #include "chromeos/audio/cras_audio_handler.h"
-#include "chromeos/services/assistant/cros_platform_api.h"
 #include "chromeos/services/assistant/platform/audio_input_provider_impl.h"
 #include "chromeos/services/assistant/platform/audio_output_provider_impl.h"
 #include "chromeos/services/assistant/platform/file_provider_impl.h"
 #include "chromeos/services/assistant/platform/network_provider_impl.h"
 #include "chromeos/services/assistant/platform/system_provider_impl.h"
 #include "chromeos/services/assistant/public/cpp/assistant_service.h"
+#include "chromeos/services/assistant/public/cpp/migration/cros_platform_api.h"
 #include "libassistant/shared/public/platform_auth.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "services/device/public/mojom/battery_monitor.mojom.h"

chromeos/services/assistant/proxy/BUILD.gn

@@ -19,8 +19,8 @@ source_set("proxy") {
     "//chromeos/assistant/internal",
     "//chromeos/assistant/internal/proto/google3",
     "//chromeos/constants",
-    "//chromeos/services/assistant:cros_libassistant",
     "//chromeos/services/assistant/public/cpp",
+    "//chromeos/services/assistant/public/cpp/migration",
     "//chromeos/services/libassistant",
     "//chromeos/services/libassistant/public/mojom",
     "//libassistant/shared/internal_api:fuchsia_api_helper",

chromeos/services/assistant/proxy/service_controller.cc

@@ -8,9 +8,9 @@
 #include "chromeos/assistant/internal/cros_display_connection.h"
 #include "chromeos/assistant/internal/internal_util.h"
 #include "chromeos/constants/chromeos_features.h"
-#include "chromeos/services/assistant/assistant_manager_service_delegate.h"
 #include "chromeos/services/assistant/public/cpp/features.h"
-#include "chromeos/services/assistant/public/cpp/libassistant_v1_api.h"
+#include "chromeos/services/assistant/public/cpp/migration/assistant_manager_service_delegate.h"
+#include "chromeos/services/assistant/public/cpp/migration/libassistant_v1_api.h"
 #include "libassistant/shared/internal_api/assistant_manager_internal.h"
 #include "libassistant/shared/internal_api/fuchsia_api_helper.h"
 

chromeos/services/assistant/public/cpp/BUILD.gn

@@ -24,8 +24,6 @@ component("cpp") {
     "device_actions.h",
     "features.cc",
     "features.h",
-    "libassistant_v1_api.cc",
-    "libassistant_v1_api.h",
   ]
 
   public_deps = [

chromeos/services/assistant/public/cpp/migration/BUILD.gn

+# 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.
+import("//chromeos/assistant/assistant.gni")
+
+assert(is_chromeos)
+assert(enable_cros_libassistant)
+
+component("migration") {
+  defines = [ "IS_ASSISTANT_SERVICE_PUBLIC_MIGRATION_IMPL" ]
+
+  sources = [
+    "assistant_manager_service_delegate.h",
+    "cros_platform_api.h",
+    "libassistant_v1_api.cc",
+    "libassistant_v1_api.h",
+  ]
+
+  public_deps = [ "//libassistant/shared/public" ]
+
+  deps = [ "//base" ]
+}
+
+component("test_support") {
+  testonly = true
+
+  output_name = "migration_test_support"
+  defines = [ "IS_ASSISTANT_SERVICE_MIGRATION_TEST_SUPPORT_IMPL" ]
+
+  sources = [
+    "fake_assistant_manager_service_delegate.cc",
+    "fake_assistant_manager_service_delegate.h",
+    "fake_platform_api.cc",
+    "fake_platform_api.h",
+  ]
+
+  deps = [
+    ":migration",
+    "//base",
+    "//chromeos/assistant/internal:test_support",
+    "//chromeos/assistant/internal/proto/google3",
+    "//libassistant/shared/public",
+  ]
+}

chromeos/services/assistant/public/cpp/migration/README

+A migration is currently in progress, moving the Libassistant APIs to 
+//chromeos/services/libassistant.
+
+The files in this directory are temporary shared between 
+//chromeos/service/assistant and //chromeos/services/libassistant.
+
+Once the migration is over, this directory should be gone.

chromeos/services/assistant/assistant_manager_service_delegate.h → chromeos/services/assistant/public/cpp/migration/assistant_manager_service_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_SERVICES_ASSISTANT_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_
-#define CHROMEOS_SERVICES_ASSISTANT_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_
+#ifndef CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_
+#define CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_
 
 #include <memory>
 
@@ -49,4 +49,4 @@ class AssistantManagerServiceDelegate {
 }  // namespace assistant
 }  // namespace chromeos
 
-#endif  // CHROMEOS_SERVICES_ASSISTANT_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_
+#endif  // CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_

chromeos/services/assistant/cros_platform_api.h → chromeos/services/assistant/public/cpp/migration/cros_platform_api.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_SERVICES_ASSISTANT_CROS_PLATFORM_API_H_
-#define CHROMEOS_SERVICES_ASSISTANT_CROS_PLATFORM_API_H_
+#ifndef CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_CROS_PLATFORM_API_H_
+#define CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_CROS_PLATFORM_API_H_
 
 #include "base/macros.h"
 #include "libassistant/shared/public/platform_api.h"
@@ -34,4 +34,4 @@ class CrosPlatformApi : public assistant_client::PlatformApi {
 }  // namespace assistant
 }  // namespace chromeos
 
-#endif  // CHROMEOS_SERVICES_ASSISTANT_CROS_PLATFORM_API_H_
+#endif  // CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_CROS_PLATFORM_API_H_

chromeos/services/assistant/test_support/fake_assistant_manager_service_delegate.cc → chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/services/assistant/test_support/fake_assistant_manager_service_delegate.h"
+#include "chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.h"
 
 #include "chromeos/assistant/internal/test_support/fake_assistant_manager.h"
 #include "chromeos/assistant/internal/test_support/fake_assistant_manager_internal.h"
-#include "chromeos/services/assistant/test_support/fake_platform_api.h"
+#include "chromeos/services/assistant/public/cpp/migration/fake_platform_api.h"
 
 namespace chromeos {
 namespace assistant {

chromeos/services/assistant/test_support/fake_assistant_manager_service_delegate.h → chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.h

@@ -2,10 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_SERVICES_ASSISTANT_TEST_SUPPORT_FAKE_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_
-#define CHROMEOS_SERVICES_ASSISTANT_TEST_SUPPORT_FAKE_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_
+#ifndef CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_FAKE_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_
+#define CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_FAKE_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_
 
-#include "chromeos/services/assistant/assistant_manager_service_delegate.h"
+#include "base/component_export.h"
+
+#include <memory>
+#include <string>
+
+#include "chromeos/services/assistant/public/cpp/migration/assistant_manager_service_delegate.h"
 
 namespace chromeos {
 namespace assistant {
@@ -15,7 +20,8 @@ class FakeAssistantManagerInternal;
 
 // Implementation of |AssistantManagerServiceDelegate| that returns fake
 // instances for all of the member methods. Used during unittests.
-class FakeAssistantManagerServiceDelegate
+class COMPONENT_EXPORT(ASSISTANT_SERVICE_MIGRATION_TEST_SUPPORT)
+    FakeAssistantManagerServiceDelegate
     : public AssistantManagerServiceDelegate {
  public:
   FakeAssistantManagerServiceDelegate();
@@ -56,4 +62,4 @@ class FakeAssistantManagerServiceDelegate
 }  // namespace assistant
 }  // namespace chromeos
 
-#endif  // CHROMEOS_SERVICES_ASSISTANT_TEST_SUPPORT_FAKE_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_
+#endif  // CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_FAKE_ASSISTANT_MANAGER_SERVICE_DELEGATE_H_

chromeos/services/assistant/test_support/fake_platform_api.cc → chromeos/services/assistant/public/cpp/migration/fake_platform_api.cc

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "base/notreached.h"
-#include "chromeos/services/assistant/test_support/fake_platform_api.h"
+#include "chromeos/services/assistant//public/cpp/migration/fake_platform_api.h"
 #include "libassistant/shared/public/platform_audio_output.h"
 
 namespace chromeos {

chromeos/services/assistant/test_support/fake_platform_api.h → chromeos/services/assistant/public/cpp/migration/fake_platform_api.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_SERVICES_ASSISTANT_TEST_SUPPORT_FAKE_PLATFORM_API_H_
-#define CHROMEOS_SERVICES_ASSISTANT_TEST_SUPPORT_FAKE_PLATFORM_API_H_
+#ifndef CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_FAKE_PLATFORM_API_H_
+#define CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_FAKE_PLATFORM_API_H_
 
 #include <memory>
 
 #include "base/macros.h"
-#include "chromeos/services/assistant/cros_platform_api.h"
+#include "chromeos/services/assistant/public/cpp/migration/cros_platform_api.h"
 
 namespace chromeos {
 namespace assistant {
@@ -42,4 +42,4 @@ class FakePlatformApi : public CrosPlatformApi {
 }  // namespace assistant
 }  // namespace chromeos
 
-#endif  // CHROMEOS_SERVICES_ASSISTANT_TEST_SUPPORT_FAKE_PLATFORM_API_H_
+#endif  // CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_FAKE_PLATFORM_API_H_

chromeos/services/assistant/public/cpp/libassistant_v1_api.cc → chromeos/services/assistant/public/cpp/migration/libassistant_v1_api.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/services/assistant/public/cpp/libassistant_v1_api.h"
+#include "chromeos/services/assistant/public/cpp/migration/libassistant_v1_api.h"
 
 #include "base/check.h"
 #include "base/check_op.h"

chromeos/services/assistant/public/cpp/libassistant_v1_api.h → chromeos/services/assistant/public/cpp/migration/libassistant_v1_api.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_SERVICES_ASSISTANT_PUBLIC_CPP_LIBASSISTANT_V1_API_H_
-#define CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_LIBASSISTANT_V1_API_H_
+#ifndef CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_LIBASSISTANT_V1_API_H_
+#define CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_LIBASSISTANT_V1_API_H_
 
 #include "base/component_export.h"
 
@@ -19,7 +19,7 @@ namespace assistant {
 // Only a single instance of this class may exist at any given time.
 // TODO(b/171748795): Remove once all Libassistant access has been moved in the
 // //chromeos/services/libassistant service.
-class COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) LibassistantV1Api {
+class COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC_MIGRATION) LibassistantV1Api {
  public:
   LibassistantV1Api(
       assistant_client::AssistantManager* assistant_manager,
@@ -46,4 +46,4 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) LibassistantV1Api {
 }  // namespace assistant
 }  // namespace chromeos
 
-#endif  // CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_LIBASSISTANT_V1_API_H_
+#endif  // CHROMEOS_SERVICES_ASSISTANT_PUBLIC_CPP_MIGRATION_LIBASSISTANT_V1_API_H_

chromeos/services/libassistant/BUILD.gn

@@ -8,7 +8,10 @@ component("libassistant") {
     "libassistant_service.h",
   ]
 
-  deps = [ "//chromeos/services/libassistant/public/mojom" ]
+  deps = [
+    "//chromeos/services/assistant/public/cpp/migration",
+    "//chromeos/services/libassistant/public/mojom",
+  ]
 
   defines = [ "IS_LIBASSISTANT_SERVICE_IMPL" ]