Convert TrayAccessibility to wm common types

ash/keyboard/keyboard_ui.cc

Index: ash/keyboard/keyboard_ui.cc
diff --git a/ash/keyboard/keyboard_ui.cc b/ash/keyboard/keyboard_ui.cc
index a9cb70c8ddb8d2a89c6291d2780693d35ef31a93..61b8e9f615419af730cb6c8e2434d24a55544132 100644
--- a/ash/keyboard/keyboard_ui.cc
+++ b/ash/keyboard/keyboard_ui.cc
@@ -5,9 +5,10 @@
 #include "ash/keyboard/keyboard_ui.h"
 
 #include "ash/common/accessibility_delegate.h"
+#include "ash/common/system/accessibility_observer.h"
+#include "ash/common/system/tray/wm_system_tray_notifier.h"
+#include "ash/common/wm_shell.h"
 #include "ash/keyboard/keyboard_ui_observer.h"
-#include "ash/shell.h"
-#include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray_accessibility.h"
 #include "base/memory/ptr_util.h"
 #include "ui/keyboard/keyboard_controller.h"
@@ -17,9 +18,7 @@ namespace ash {
 class KeyboardUIImpl : public KeyboardUI, public AccessibilityObserver {
  public:
   KeyboardUIImpl() {
-    // The Shell may not exist in some unit tests.
-    Shell::GetInstance()->system_tray_notifier()->AddAccessibilityObserver(
-        this);
+    WmShell::Get()->system_tray_notifier()->AddAccessibilityObserver(this);

[msw, 2016/06/18 01:15:06]

Shouldn't this be removed on destruction? (if the shell && notifier exist)

[James Cook, 2016/06/20 17:27:33]

Good catch. Done.

   }
 
   ~KeyboardUIImpl() override {}
@@ -33,8 +32,8 @@ class KeyboardUIImpl : public KeyboardUI, public AccessibilityObserver {
     // to the appropriate keyboard functions.
   }
   bool IsEnabled() override {
-    return Shell::GetInstance()
-        ->accessibility_delegate()
+    return WmShell::Get()
+        ->GetAccessibilityDelegate()
         ->IsVirtualKeyboardEnabled();
   }