Remove VerifyProvider clientOp support

Since we are sending app capabilities to the server, the VerifyProvider
clientOp is no longer needed. This is the second step of removing the
logic:

1. Remove VerifyProvider in the list of supported actions (internal)
2. Remove Handling of the VerifyProvider action (external)
3. Remove the logic of notifying the VerifyProvider action (internal)

Bug: b/134085742
Change-Id: I5c6eab87d24655198696a1b711efeb4ecf15a9dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1637650Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Yue Li <updowndota@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665237}

chrome/browser/ui/ash/assistant/device_actions.cc

@@ -206,14 +206,6 @@ void DeviceActions::OpenAndroidApp(AndroidAppInfoPtr app_info,
   std::move(callback).Run(!!app);
 }
 
-void DeviceActions::VerifyAndroidApp(std::vector<AndroidAppInfoPtr> apps_info,
-                                     VerifyAndroidAppCallback callback) {
-  for (const auto& app_info : apps_info) {
-    app_info->status = GetAndroidAppStatus(app_info->package_name);
-  }
-  std::move(callback).Run(std::move(apps_info));
-}
-
 void DeviceActions::LaunchAndroidIntent(const std::string& intent) {
   auto* app = ARC_GET_INSTANCE_FOR_METHOD(
       arc::ArcServiceManager::Get()->arc_bridge_service()->app(), LaunchIntent);

chrome/browser/ui/ash/assistant/device_actions.h

@@ -28,9 +28,6 @@ class DeviceActions : public chromeos::assistant::mojom::DeviceActions,
   void SetNightLightEnabled(bool enabled) override;
   void OpenAndroidApp(chromeos::assistant::mojom::AndroidAppInfoPtr app_info,
                       OpenAndroidAppCallback callback) override;
-  void VerifyAndroidApp(
-      std::vector<chromeos::assistant::mojom::AndroidAppInfoPtr> apps_info,
-      VerifyAndroidAppCallback callback) override;
   void LaunchAndroidIntent(const std::string& intent) override;
   void AddAppListEventSubscriber(
       chromeos::assistant::mojom::AppListEventSubscriberPtr subscriber)

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -96,21 +96,6 @@ bool IsScreenContextAllowed(ash::AssistantStateBase* assistant_state) {
          assistant_state->context_enabled().value_or(false);
 }
 
-action::AppStatus GetActionAppStatus(mojom::AppStatus status) {
-  switch (status) {
-    case mojom::AppStatus::UNKNOWN:
-      return action::UNKNOWN;
-    case mojom::AppStatus::AVAILABLE:
-      return action::AVAILABLE;
-    case mojom::AppStatus::UNAVAILABLE:
-      return action::UNAVAILABLE;
-    case mojom::AppStatus::VERSION_MISMATCH:
-      return action::VERSION_MISMATCH;
-    case mojom::AppStatus::DISABLED:
-      return action::DISABLED;
-  }
-}
-
 ash::mojom::AssistantTimerState GetTimerState(
     assistant_client::Timer::State state) {
   switch (state) {
@@ -639,24 +624,6 @@ void AssistantManagerServiceImpl::OnOpenAndroidApp(
                      weak_factory_.GetWeakPtr(), interaction));
 }
 
-void AssistantManagerServiceImpl::OnVerifyAndroidApp(
-    const std::vector<action::AndroidAppInfo>& apps_info,
-    const action::InteractionInfo& interaction) {
-  ENSURE_MAIN_THREAD(&AssistantManagerServiceImpl::OnVerifyAndroidApp,
-                     apps_info, interaction);
-  std::vector<mojom::AndroidAppInfoPtr> apps_info_list;
-  for (auto& app_info : apps_info) {
-    mojom::AndroidAppInfoPtr app_info_ptr = mojom::AndroidAppInfo::New();
-    app_info_ptr->package_name = app_info.package_name;
-    apps_info_list.push_back(std::move(app_info_ptr));
-  }
-  service_->device_actions()->VerifyAndroidApp(
-      std::move(apps_info_list),
-      base::BindOnce(
-          &AssistantManagerServiceImpl::HandleVerifyAndroidAppResponse,
-          weak_factory_.GetWeakPtr(), interaction));
-}
-
 void AssistantManagerServiceImpl::OnOpenMediaAndroidIntentOnMainThread(
     const std::string play_media_args_proto,
     action::AndroidAppInfo* android_app_info) {
@@ -1059,28 +1026,6 @@ void AssistantManagerServiceImpl::HandleOpenAndroidAppResponse(
       interaction_proto, "open_provider_response", options, [](auto) {});
 }
 
-void AssistantManagerServiceImpl::HandleVerifyAndroidAppResponse(
-    const action::InteractionInfo& interaction,
-    std::vector<mojom::AndroidAppInfoPtr> apps_info) {
-  std::vector<action::AndroidAppInfo> action_apps_info;
-  for (const auto& app_info : apps_info) {
-    action_apps_info.push_back({app_info->package_name, app_info->version,
-                                app_info->localized_app_name, app_info->intent,
-                                GetActionAppStatus(app_info->status)});
-  }
-  std::string interaction_proto = CreateVerifyProviderResponseInteraction(
-      interaction.interaction_id, action_apps_info);
-
-  assistant_client::VoicelessOptions options;
-  options.obfuscated_gaia_id = interaction.user_id;
-  // Set the request to be user initiated so that a new conversation will be
-  // created to handle the client OPs in the response of this request.
-  options.is_user_initiated = true;
-
-  assistant_manager_internal_->SendVoicelessInteraction(
-      interaction_proto, "verify_provider_response", options, [](auto) {});
-}
-
 // assistant_client::DeviceStateListener overrides
 // Run on LibAssistant threads
 // This method currently only triggered as the callback of libassistant bootup

chromeos/services/assistant/assistant_manager_service_impl.h

@@ -153,8 +153,6 @@ class AssistantManagerServiceImpl
   void OnShowNotification(const action::Notification& notification) override;
   void OnOpenAndroidApp(const action::AndroidAppInfo& app_info,
                         const action::InteractionInfo& interaction) override;
-  void OnVerifyAndroidApp(const std::vector<action::AndroidAppInfo>& apps_info,
-                          const action::InteractionInfo& interaction) override;
 
   // AssistantEventObserver overrides:
   void OnSpeechLevelUpdated(float speech_level) override;
@@ -225,9 +223,6 @@ class AssistantManagerServiceImpl
 
   void HandleOpenAndroidAppResponse(const action::InteractionInfo& interaction,
                                     bool app_opened);
-  void HandleVerifyAndroidAppResponse(
-      const action::InteractionInfo& interaction,
-      std::vector<mojom::AndroidAppInfoPtr> apps_info);
 
   void HandleLaunchMediaIntentResponse(bool app_opened);
 

chromeos/services/assistant/public/mojom/assistant.mojom

@@ -180,10 +180,6 @@ interface DeviceActions {
   // Open the Android app if the app is available.
   OpenAndroidApp(AndroidAppInfo app_info) => (bool app_opened);
 
-  // Verify the status of the Android apps.
-  VerifyAndroidApp(array<AndroidAppInfo> apps_info) => (array<AndroidAppInfo>
-                                                        apps_info);
-
   // Launch Android intent. The intent is encoded as a URI string.
   // See Intent.toUri().
   LaunchAndroidIntent(string intent);

chromeos/services/assistant/service_unittest.cc

@@ -139,9 +139,6 @@ class FakeDeviceActions : mojom::DeviceActions {
   void SetNightLightEnabled(bool enabled) override {}
   void OpenAndroidApp(chromeos::assistant::mojom::AndroidAppInfoPtr app_info,
                       OpenAndroidAppCallback callback) override {}
-  void VerifyAndroidApp(
-      std::vector<chromeos::assistant::mojom::AndroidAppInfoPtr> apps_info,
-      VerifyAndroidAppCallback callback) override {}
   void LaunchAndroidIntent(const std::string& intent) override {}
   void AddAppListEventSubscriber(
       chromeos::assistant::mojom::AppListEventSubscriberPtr subscriber)