chromeos: random wiring for OopAsh

Adds registering the ui::mojom::Arc interface.
Adds early to AccessibilityController::UpdateVirtualKeyboardFromPref.

BUG=837686
TEST=none

Change-Id: If417134ed26931a050e9bfdfd4b267d8ee819b9a
Reviewed-on: https://chromium-review.googlesource.com/1111012Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569413}

ash/accessibility/accessibility_controller.cc

@@ -41,6 +41,7 @@
 #include "ui/aura/window.h"
 #include "ui/base/cursor/cursor_type.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/ui_base_features.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/public/cpp/notifier_id.h"
@@ -1023,7 +1024,7 @@ void AccessibilityController::UpdateVirtualKeyboardFromPref() {
 
   keyboard::SetAccessibilityKeyboardEnabled(enabled);
 
-  if (Shell::GetAshConfig() == Config::MASH) {
+  if (!features::IsAshInBrowserProcess()) {
     // TODO(mash): Support on-screen keyboard. See https://crbug.com/646565.
     NOTIMPLEMENTED();
     return;

ash/shell_port_mash.h

@@ -25,6 +25,7 @@ class ImmersiveHandlerFactoryMash;
 class WindowManager;
 
 // ShellPort implementation for mash. See ash/README.md for more.
+// NOTE: this is also used for OopAsh.
 class ShellPortMash : public ShellPort {
  public:
   ShellPortMash(WindowManager* window_manager,

ash/ws/ash_gpu_interface_provider.cc

@@ -26,11 +26,17 @@ AshGpuInterfaceProvider::~AshGpuInterfaceProvider() = default;
 
 void AshGpuInterfaceProvider::RegisterGpuInterfaces(
     service_manager::BinderRegistry* registry) {
-  registry->AddInterface(base::BindRepeating(
-      &AshGpuInterfaceProvider::BindGpuRequest, base::Unretained(this)));
+  registry->AddInterface<ui::mojom::Arc>(base::BindRepeating(
+      &AshGpuInterfaceProvider::BindArcRequest, base::Unretained(this)));
   registry->AddInterface(base::BindRepeating(
       &AshGpuInterfaceProvider::BindDiscardableSharedMemoryManagerRequest,
       base::Unretained(this)));
+  registry->AddInterface(base::BindRepeating(
+      &AshGpuInterfaceProvider::BindGpuRequest, base::Unretained(this)));
+}
+
+void AshGpuInterfaceProvider::BindArcRequest(ui::mojom::ArcRequest request) {
+  gpu_host_->AddArc(std::move(request));
 }
 
 void AshGpuInterfaceProvider::BindDiscardableSharedMemoryManagerRequest(

ash/ws/ash_gpu_interface_provider.h

@@ -6,6 +6,7 @@
 #define ASH_WS_ASH_GPU_INTERFACE_PROVIDER_H_
 
 #include "components/discardable_memory/public/interfaces/discardable_shared_memory_manager.mojom.h"
+#include "services/ui/public/interfaces/arc.mojom.h"
 #include "services/ui/public/interfaces/gpu.mojom.h"
 #include "services/ui/ws2/gpu_interface_provider.h"
 
@@ -34,9 +35,9 @@ class AshGpuInterfaceProvider : public ui::ws2::GpuInterfaceProvider {
       service_manager::BinderRegistry* registry) override;
 
  private:
+  void BindArcRequest(ui::mojom::ArcRequest request);
   void BindDiscardableSharedMemoryManagerRequest(
       discardable_memory::mojom::DiscardableSharedMemoryManagerRequest request);
-
   void BindGpuRequest(ui::mojom::GpuRequest request);
 
   ui::gpu_host::GpuHost* gpu_host_;