mash: Migrate AccessibilityDelegate access to WmShell.

chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc

 // Copyright 2014 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 "ui/chromeos/touch_exploration_controller.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/macros.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/draw_waiter_for_test.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/events/test/test_event_handler.h"
 
 namespace ui {

[James Cook, 2016/06/28 22:34:25]

optional: kinda weird that this file is in namespace ui

[msw, 2016/06/28 22:49:50]

Done.

 
 class TouchExplorationTest : public InProcessBrowserTest {
  public:
   TouchExplorationTest() : simulated_clock_(new base::SimpleTestTickClock()) {
     // Tests fail if time is ever 0.
     simulated_clock_->Advance(base::TimeDelta::FromMilliseconds(10));
   }
   ~TouchExplorationTest() override {}
 
  protected:
@@ skipping 12 matching lines @@
     event_handler_.reset(new ui::test::TestEventHandler());
     root_window_->AddPreTargetHandler(event_handler_.get());
   }
 
   void TearDownOnMainThread() override {
     SwitchTouchExplorationMode(false);
     root_window_->RemovePreTargetHandler(event_handler_.get());
   }
 
   void SwitchTouchExplorationMode(bool on) {
-    ash::AccessibilityDelegate* ad =
-        ash::Shell::GetInstance()->accessibility_delegate();
-    if (on != ad->IsSpokenFeedbackEnabled())
-      ad->ToggleSpokenFeedback(ash::A11Y_NOTIFICATION_NONE);
+    ash::AccessibilityDelegate* delegate =
+        ash::WmShell::Get()->GetAccessibilityDelegate();
+    if (on != delegate->IsSpokenFeedbackEnabled())
+      delegate->ToggleSpokenFeedback(ash::A11Y_NOTIFICATION_NONE);
   }
 
   base::TimeTicks Now() { return simulated_clock_->NowTicks(); }
 
   ui::GestureDetector::Config gesture_detector_config_;
   base::SimpleTestTickClock* simulated_clock_;
   aura::Window* root_window_;
   std::unique_ptr<ui::test::TestEventHandler> event_handler_;
 
  private:
@@ skipping 168 matching lines @@
 
   // Continuing to move the touch exploration finger should send more mouse
   // events.
   generator.MoveTouchId(gfx::Point(509, 609), 1);
   EXPECT_EQ(0, event_handler_->num_touch_events());
   EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
   EXPECT_FALSE(cursor_client->IsCursorVisible());
 }
 
 }  // namespace ui