Move AccessibilityDelegate ownership to ash::WmShell

ash/mus/shell_delegate_mus.cc

 // Copyright 2016 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/mus/shell_delegate_mus.h"
 
 #include <utility>
 
-#include "ash/common/default_accessibility_delegate.h"
 #include "ash/common/gpu_support_stub.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/pointer_watcher_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/default_system_tray_delegate.h"
+#include "ash/mus/accessibility_delegate_mus.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "components/user_manager/user_info_impl.h"
 #include "ui/app_list/presenter/app_list_presenter.h"
 #include "ui/gfx/image/image.h"
 
 namespace ash {
 namespace {
 
 class SessionStateDelegateStub : public SessionStateDelegate {
@@ skipping 66 matching lines @@
     return MEDIA_CAPTURE_NONE;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub);
 };
 
 }  // namespace
 
 ShellDelegateMus::ShellDelegateMus(
-    std::unique_ptr<app_list::AppListPresenter> app_list_presenter)
-    : app_list_presenter_(std::move(app_list_presenter)) {}
+    std::unique_ptr<app_list::AppListPresenter> app_list_presenter,
+    shell::Connector* connector)
+    : app_list_presenter_(std::move(app_list_presenter)),
+      connector_(connector) {
+  // |connector_| may be null in tests.
+}
 
 ShellDelegateMus::~ShellDelegateMus() {}
 
 bool ShellDelegateMus::IsFirstRunAfterBoot() const {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool ShellDelegateMus::IsIncognitoAllowed() const {
   NOTIMPLEMENTED();
@@ skipping 59 matching lines @@
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
   NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
   return new SessionStateDelegateStub;
 }
 
 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() {
-  NOTIMPLEMENTED() << " Using the default AccessibilityDelegate implementation";
-  return new DefaultAccessibilityDelegate;
+  return new AccessibilityDelegateMus(connector_);
 }
 
 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {
   NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation";
   return new MediaDelegateStub;
@@ skipping 20 matching lines @@
   NOTIMPLEMENTED();
   return base::string16();
 }
 
 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
   NOTIMPLEMENTED();
   return gfx::Image();
 }
 
 }  // namespace ash