mash: Migrate AccessibilityDelegate access to WmShell.

ash/system/tray/system_tray_unittest.cc

 // Copyright (c) 2012 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/system/tray/system_tray.h"
 
 #include <vector>
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/tray/system_tray_bubble.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_container.h"
 #include "ash/common/system/web_notification/web_notification_tray.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/wm/window_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
@@ skipping 394 matching lines @@
   }
 }
 
 #if defined(OS_CHROMEOS)
 // Accessibility/Settings tray items are available only on cros.
 #define MAYBE_WithSystemModal WithSystemModal
 #else
 #define MAYBE_WithSystemModal DISABLED_WithSystemModal
 #endif
 TEST_F(SystemTrayTest, MAYBE_WithSystemModal) {
-  // Check if the accessibility item is created even with system modal
-  // dialog.
-  Shell::GetInstance()->accessibility_delegate()->SetVirtualKeyboardEnabled(
-      true);
+  // Check if the accessibility item is created even with system modal dialog.
+  WmShell::Get()->GetAccessibilityDelegate()->SetVirtualKeyboardEnabled(true);
   views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
       new ModalWidgetDelegate(), Shell::GetPrimaryRootWindow(),
       gfx::Rect(0, 0, 100, 100));
   widget->Show();
 
   SystemTray* tray = GetPrimarySystemTray();
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
 
   ASSERT_TRUE(tray->HasSystemBubble());
   const views::View* accessibility =
@@ skipping 103 matching lines @@
   // Hide the default view, ensure the tray bubble height is back to zero.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
 
   EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
 }
 #endif  // OS_CHROMEOS
 
 }  // namespace test
 }  // namespace ash