Revert "Adds AshAssistantController."

This reverts commit 6dbf08b3.

Reason for revert: Compile failure on linux-chromeos-dbg
https://ci.chromium.org/buildbot/chromium.chromiumos/linux-chromeos-dbg/4899

BUG=826101

Original change's description:
> Adds AshAssistantController.
> 
> Bug: b:76028606
> Change-Id: Iafdafed688333035f67067b3f60c9b35c99a8276
> Reviewed-on: https://chromium-review.googlesource.com/973551
> Commit-Queue: David Black <dmblack@google.com>
> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
> Reviewed-by: Muyuan Li <muyuanli@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#545908}

TBR=xiyuan@chromium.org,dcheng@chromium.org,xiaohuic@chromium.org,dmblack@google.com,muyuanli@chromium.org

Change-Id: Ic33bb5e3efcec6547469999fd42e662529275942
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b:76028606
Reviewed-on: https://chromium-review.googlesource.com/981464Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545918}

ash/BUILD.gn

@@ -94,8 +94,6 @@ component("ash") {
     "ash_layout_constants.cc",
     "ash_layout_constants.h",
     "ash_view_ids.h",
-    "assistant/ash_assistant_controller.cc",
-    "assistant/ash_assistant_controller.h",
     "autoclick/autoclick_controller.cc",
     "autoclick/autoclick_controller.h",
     "cancel_mode.cc",

ash/DEPS

@@ -71,7 +71,6 @@ include_rules = [
   "-chromeos/login/login_state.h",
   # TODO(jamescook): Eliminate this. http://crbug.com/644355
   "+chromeos/network",
-  "+chromeos/services/assistant/public" ,
   # TODO(jamescook): Eliminate this. http://crbug.com/644361
   "+chromeos/settings/timezone_settings.h",
   "+chromeos/system",

ash/assistant/ash_assistant_controller.cc

-// Copyright (c) 2018 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 "ash/assistant/ash_assistant_controller.h"
-
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
-
-namespace ash {
-
-AshAssistantController::AshAssistantController()
-    : assistant_controller_binding_(this),
-      assistant_event_subscriber_binding_(this) {}
-
-AshAssistantController::~AshAssistantController() {
-  assistant_controller_binding_.Close();
-  assistant_event_subscriber_binding_.Close();
-}
-
-void AshAssistantController::BindRequest(
-    mojom::AshAssistantControllerRequest request) {
-  assistant_controller_binding_.Bind(std::move(request));
-}
-
-void AshAssistantController::SetAssistant(
-    chromeos::assistant::mojom::AssistantPtr assistant) {
-  // Subscribe to Assistant events.
-  chromeos::assistant::mojom::AssistantEventSubscriberPtr ptr;
-  assistant_event_subscriber_binding_.Bind(mojo::MakeRequest(&ptr));
-  assistant->AddAssistantEventSubscriber(std::move(ptr));
-}
-
-void AshAssistantController::OnHtmlResponse(const std::string& response) {
-  // TODO(dmblack): Handle.
-  NOTIMPLEMENTED();
-}
-
-void AshAssistantController::OnTextResponse(const std::string& response) {
-  // TODO(dmblack): Handle.
-  NOTIMPLEMENTED();
-}
-
-void AshAssistantController::OnOpenUrlResponse(const GURL& url) {
-  Shell::Get()->shell_delegate()->OpenUrlFromArc(url);
-}
-
-}  // namespace ash

ash/assistant/ash_assistant_controller.h

-// Copyright 2018 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_ASSISTANT_ASH_ASSISTANT_CONTROLLER_H_
-#define ASH_ASSISTANT_ASH_ASSISTANT_CONTROLLER_H_
-
-#include "ash/public/interfaces/ash_assistant_controller.mojom.h"
-#include "base/macros.h"
-#include "chromeos/services/assistant/public/mojom/assistant.mojom.h"
-#include "mojo/public/cpp/bindings/binding.h"
-
-namespace ash {
-
-class AshAssistantController
-    : public mojom::AshAssistantController,
-      public chromeos::assistant::mojom::AssistantEventSubscriber {
- public:
-  AshAssistantController();
-  ~AshAssistantController() override;
-
-  void BindRequest(mojom::AshAssistantControllerRequest request);
-
-  // chromeos::assistant::mojom::AssistantEventSubscriber:
-  void OnHtmlResponse(const std::string& response) override;
-  void OnTextResponse(const std::string& response) override;
-  void OnOpenUrlResponse(const GURL& url) override;
-
-  // mojom::AshAssistantController:
-  void SetAssistant(
-      chromeos::assistant::mojom::AssistantPtr assistant) override;
-
- private:
-  mojo::Binding<mojom::AshAssistantController> assistant_controller_binding_;
-  mojo::Binding<chromeos::assistant::mojom::AssistantEventSubscriber>
-      assistant_event_subscriber_binding_;
-
-  DISALLOW_COPY_AND_ASSIGN(AshAssistantController);
-};
-
-}  // namespace ash
-
-#endif  // ASH_ASSISTANT_ASH_ASSISTANT_CONTROLLER_H_

ash/manifest.json

@@ -13,7 +13,6 @@
           "ash::mojom::AccessibilityController",
           "ash::mojom::AccessibilityFocusRingController",
           "ash::mojom::AppListController",
-          "ash::mojom::AshAssistantController",
           "ash::mojom::AshMessageCenterController",
           "ash::mojom::CastConfig",
           "ash::mojom::DockedMagnifierController",

ash/mojo_interface_factory.cc

@@ -10,7 +10,6 @@
 #include "ash/accessibility/accessibility_controller.h"
 #include "ash/accessibility/accessibility_focus_ring_controller.h"
 #include "ash/app_list/app_list_controller_impl.h"
-#include "ash/assistant/ash_assistant_controller.h"
 #include "ash/cast_config_controller.h"
 #include "ash/display/ash_display_controller.h"
 #include "ash/highlighter/highlighter_controller.h"
@@ -41,7 +40,6 @@
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/single_thread_task_runner.h"
-#include "chromeos/chromeos_switches.h"
 
 namespace ash {
 namespace mojo_interface_factory {
@@ -71,11 +69,6 @@ void BindAppListControllerRequestOnMainThread(
   Shell::Get()->app_list_controller()->BindRequest(std::move(request));
 }
 
-void BindAshAssistantControllerRequestOnMainThread(
-    mojom::AshAssistantControllerRequest request) {
-  Shell::Get()->ash_assistant_controller()->BindRequest(std::move(request));
-}
-
 void BindAshDisplayControllerRequestOnMainThread(
     mojom::AshDisplayControllerRequest request) {
   Shell::Get()->ash_display_controller()->BindRequest(std::move(request));
@@ -201,11 +194,6 @@ void RegisterInterfaces(
       main_thread_task_runner);
   registry->AddInterface(base::Bind(&BindAppListControllerRequestOnMainThread),
                          main_thread_task_runner);
-  if (chromeos::switches::IsAssistantEnabled()) {
-    registry->AddInterface(
-        base::Bind(&BindAshAssistantControllerRequestOnMainThread),
-        main_thread_task_runner);
-  }
   registry->AddInterface(
       base::Bind(&BindAshDisplayControllerRequestOnMainThread),
       main_thread_task_runner);

ash/public/interfaces/BUILD.gn

@@ -16,7 +16,6 @@ mojom("interfaces_internal") {
     "accessibility_controller.mojom",
     "accessibility_focus_ring_controller.mojom",
     "app_list.mojom",
-    "ash_assistant_controller.mojom",
     "ash_display_controller.mojom",
     "ash_message_center_controller.mojom",
     "cast_config.mojom",
@@ -57,7 +56,6 @@ mojom("interfaces_internal") {
   ]
 
   public_deps = [
-    "//chromeos/services/assistant/public/mojom",
     "//components/password_manager/public/interfaces",
     "//components/proximity_auth/public/interfaces",
     "//components/signin/public/interfaces",

ash/public/interfaces/ash_assistant_controller.mojom

-// Copyright 2018 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.
-
-module ash.mojom;
-
-import "chromeos/services/assistant/public/mojom/assistant.mojom";
-
-// Interface for AssistantManagerService to communicate with
-// AshAssistantController.
-interface AshAssistantController {
-  // Provides a reference to the underlying service |assistant|.
-  SetAssistant(chromeos.assistant.mojom.Assistant assistant);
-};

ash/shell.cc

@@ -19,7 +19,6 @@
 #include "ash/accessibility/accessibility_focus_ring_controller.h"
 #include "ash/app_list/app_list_controller_impl.h"
 #include "ash/ash_constants.h"
-#include "ash/assistant/ash_assistant_controller.h"
 #include "ash/autoclick/autoclick_controller.h"
 #include "ash/cast_config_controller.h"
 #include "ash/detachable_base/detachable_base_handler.h"
@@ -146,6 +145,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/sys_info.h"
 #include "base/trace_event/trace_event.h"
+#include "chromeos/chromeos_switches.h"
 #include "chromeos/system/devicemode.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
@@ -1009,10 +1009,6 @@ void Shell::Init(ui::ContextFactory* context_factory,
   tablet_mode_controller_ = std::make_unique<TabletModeController>();
   shelf_controller_ = std::make_unique<ShelfController>();
 
-  ash_assistant_controller_ = chromeos::switches::IsAssistantEnabled()
-                                  ? std::make_unique<AshAssistantController>()
-                                  : nullptr;
-
   magnifier_key_scroll_handler_ = MagnifierKeyScroller::CreateHandler();
   AddPreTargetHandler(magnifier_key_scroll_handler_.get());
   speech_feedback_handler_ = SpokenFeedbackToggler::CreateHandler();

ash/shell.h

@@ -19,7 +19,6 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "chromeos/chromeos_switches.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/aura/window.h"
 #include "ui/display/screen.h"
@@ -79,7 +78,6 @@ class AcceleratorController;
 class AccessibilityController;
 class AccessibilityDelegate;
 class AccessibilityFocusRingController;
-class AshAssistantController;
 class AshDisplayController;
 class AppListControllerImpl;
 class NativeCursorManagerAsh;
@@ -317,10 +315,6 @@ class ASH_EXPORT Shell : public SessionObserver,
   AppListControllerImpl* app_list_controller() {
     return app_list_controller_.get();
   }
-  AshAssistantController* ash_assistant_controller() {
-    DCHECK(chromeos::switches::IsAssistantEnabled());
-    return ash_assistant_controller_.get();
-  }
   AshDisplayController* ash_display_controller() {
     return ash_display_controller_.get();
   }
@@ -672,7 +666,6 @@ class ASH_EXPORT Shell : public SessionObserver,
   std::unique_ptr<AccessibilityFocusRingController>
       accessibility_focus_ring_controller_;
   std::unique_ptr<AppListControllerImpl> app_list_controller_;
-  std::unique_ptr<AshAssistantController> ash_assistant_controller_;
   std::unique_ptr<AshDisplayController> ash_display_controller_;
   std::unique_ptr<BacklightsForcedOffSetter> backlights_forced_off_setter_;
   std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;

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

@@ -18,9 +18,7 @@ interface Assistant {
   AddAssistantEventSubscriber(AssistantEventSubscriber subscriber);
 };
 
-// Subscribes to assistant's event. Responses from the assistant may contain
-// untrusted third-party content. Subscriber implementations must be sure to
-// handle the response data appropriately.
+// Subscribes to assistant's event.
 interface AssistantEventSubscriber {
   // Assistant's got Html response from server.
   OnHtmlResponse(string response);

chromeos/services/assistant/service.cc

@@ -6,7 +6,6 @@
 
 #include <utility>
 
-#include "ash/public/interfaces/ash_assistant_controller.mojom.h"
 #include "ash/public/interfaces/constants.mojom.h"
 #include "base/bind.h"
 #include "base/logging.h"
@@ -107,14 +106,6 @@ void Service::Init(mojom::ClientPtr client, mojom::AudioInputPtr audio_input) {
 #if BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
   assistant_manager_service_ =
       std::make_unique<AssistantManagerServiceImpl>(std::move(audio_input));
-
-  // Bind to Assistant controller in ash.
-  ash::mojom::AshAssistantControllerPtr assistant_controller;
-  context()->connector()->BindInterface(ash::mojom::kServiceName,
-                                        &assistant_controller);
-  mojom::AssistantPtr ptr;
-  BindAssistantConnection(mojo::MakeRequest(&ptr));
-  assistant_controller->SetAssistant(std::move(ptr));
 #else
   assistant_manager_service_ =
       std::make_unique<FakeAssistantManagerServiceImpl>();