mash: Migrate AccessibilityDelegate access to WmShell.

ash/wm/overview/window_selector_unittest.cc

 // Copyright 2013 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 <algorithm>
 #include <vector>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
@@ skipping 122 matching lines @@
     return CreateTestWindowInShellWithDelegate(&delegate_, -1, bounds);
   }
 
   aura::Window* CreateWindowWithId(const gfx::Rect& bounds, int id) {
     return CreateTestWindowInShellWithDelegate(&delegate_, id, bounds);
   }
   aura::Window* CreateNonActivatableWindow(const gfx::Rect& bounds) {
     aura::Window* window = CreateWindow(bounds);
     aura::client::SetActivationDelegate(window,
                                         &non_activatable_activation_delegate_);
-    EXPECT_FALSE(ash::wm::CanActivateWindow(window));
+    EXPECT_FALSE(wm::CanActivateWindow(window));
     return window;
   }
 
   // Creates a Widget containing a Window with the given |bounds|. This should
   // be used when the test requires a Widget. For example any test that will
   // cause a window to be closed via
   // views::Widget::GetWidgetForNativeView(window)->Close().
   std::unique_ptr<views::Widget> CreateWindowWidget(const gfx::Rect& bounds) {
     std::unique_ptr<views::Widget> widget(new views::Widget);
     views::Widget::InitParams params;
@@ skipping 129 matching lines @@
   }
 
   bool showing_filter_widget() {
     return window_selector()
         ->text_filter_widget_->GetNativeWindow()
         ->layer()
         ->GetTargetTransform()
         .IsIdentity();
   }
 
-  views::Widget* GetCloseButton(ash::WindowSelectorItem* window) {
+  views::Widget* GetCloseButton(WindowSelectorItem* window) {
     return window->close_button_->GetWidget();
   }
 
-  views::LabelButton* GetLabelButtonView(ash::WindowSelectorItem* window) {
+  views::LabelButton* GetLabelButtonView(WindowSelectorItem* window) {
     return window->window_label_button_view_;
   }
 
   // Tests that a window is contained within a given WindowSelectorItem, and
   // that both the window and its matching close button are within the same
   // screen.
   void IsWindowAndCloseButtonInScreen(aura::Window* window,
                                       WindowSelectorItem* window_item) {
     aura::Window* root_window =
         WmWindowAura::GetAuraWindow(window_item->root_window());
@@ skipping 76 matching lines @@
   expected_bounds = gfx::Rect(112, -32, 75, 32);
   expected_bounds_MD = gfx::Rect(10, -40, 280, 40);
   EXPECT_EQ((material ? expected_bounds_MD : expected_bounds).ToString(),
             text_filter->GetClientAreaBoundsInScreen().ToString());
 }
 #endif
 
 // Tests that an a11y alert is sent on entering overview mode.
 TEST_P(WindowSelectorTest, A11yAlertOnOverviewMode) {
   gfx::Rect bounds(0, 0, 400, 400);
-  AccessibilityDelegate* delegate =
-      ash::Shell::GetInstance()->accessibility_delegate();
+  AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
   std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
   EXPECT_NE(delegate->GetLastAccessibilityAlert(),
             A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED);
   ToggleOverview();
   EXPECT_EQ(delegate->GetLastAccessibilityAlert(),
             A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED);
 }
 
 // Tests that there are no crashes when there is not enough screen space
 // available to show all of the windows.
@@ skipping 517 matching lines @@
   EXPECT_TRUE(wm::GetWindowState(window1.get())->IsFullscreen());
 }
 
 // Tests that the shelf dimming state is removed while in overview and restored
 // on exiting overview.
 TEST_P(WindowSelectorTest, OverviewUndimsShelf) {
   gfx::Rect bounds(0, 0, 400, 400);
   std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
   wm::WindowState* window_state = wm::GetWindowState(window1.get());
   window_state->Maximize();
-  ash::ShelfWidget* shelf =
-      Shell::GetPrimaryRootWindowController()->shelf_widget();
+  ShelfWidget* shelf = Shell::GetPrimaryRootWindowController()->shelf_widget();
   EXPECT_TRUE(shelf->GetDimsShelf());
   ToggleOverview();
   EXPECT_FALSE(shelf->GetDimsShelf());
   ToggleOverview();
   EXPECT_TRUE(shelf->GetDimsShelf());
 }
 
 // Tests that entering overview when a fullscreen window is active in maximized
 // mode correctly applies the transformations to the window and correctly
 // updates the window bounds on exiting overview mode: http://crbug.com/401664.
@@ skipping 323 matching lines @@
 }
 
 // Tests starting overview during a drag and drop tracking operation.
 // TODO(flackr): Fix memory corruption crash when running locally (not failing
 // on bots). See http://crbug.com/342528.
 TEST_P(WindowSelectorTest, DISABLED_DragDropInProgress) {
   bool drag_canceled_by_test = false;
   gfx::Rect bounds(0, 0, 400, 400);
   std::unique_ptr<aura::Window> window(CreateWindow(bounds));
   test::ShellTestApi shell_test_api(Shell::GetInstance());
-  ash::DragDropController* drag_drop_controller =
+  DragDropController* drag_drop_controller =
       shell_test_api.drag_drop_controller();
   ui::OSExchangeData data;
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&WindowSelectorTest::ToggleOverview, base::Unretained(this)));
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&CancelDrag, drag_drop_controller, &drag_canceled_by_test));
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
   drag_drop_controller->StartDragAndDrop(
@@ skipping 533 matching lines @@
       bounds.y());
   EXPECT_LE(transformed_rect.bottom(), bounds.bottom());
   EXPECT_NEAR(transformed_rect.x() - bounds.x(),
               bounds.right() - transformed_rect.right(), 1);
   EXPECT_NEAR(
       transformed_rect.y() + (int)(scale * inset) - header_height - bounds.y(),
       bounds.bottom() - transformed_rect.bottom(), 1);
 }
 
 }  // namespace ash