mash: Migrate shelf app list button to wm common types

chrome/browser/chromeos/accessibility/sticky_keys_browsertest.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 <stddef.h>
 
 #include "ash/common/system/tray/system_tray.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/sticky_keys/sticky_keys_overlay.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
@@ skipping 135 matching lines @@
   EnableStickyKeys();
 
   OmniboxView* omnibox =
       browser()->window()->GetLocationBar()->GetOmniboxView();
 
   // Give the omnibox focus.
   omnibox->ShowURL();
 
   // Make sure that the AppList is not erronously displayed and the omnibox
   // doesn't lost focus
-  EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
+  EXPECT_FALSE(ash::WmShell::Get()->GetAppListTargetVisibility());
   EXPECT_TRUE(omnibox->GetNativeView()->HasFocus());
 
   // Type 'foo'.
   SendKeyPress(ui::VKEY_F);
   SendKeyPress(ui::VKEY_O);
   SendKeyPress(ui::VKEY_O);
 
   // Verify the location of the caret.
   size_t start, end;
   omnibox->GetSelectionBounds(&start, &end);
   ASSERT_EQ(3U, start);
   ASSERT_EQ(3U, end);
 
-  EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
+  EXPECT_FALSE(ash::WmShell::Get()->GetAppListTargetVisibility());
   EXPECT_TRUE(omnibox->GetNativeView()->HasFocus());
 
   // Hit Home by sequencing Search (left Windows) and Left (arrow).
   SendKeyPress(ui::VKEY_LWIN);
   SendKeyPress(ui::VKEY_LEFT);
 
-  EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
+  EXPECT_FALSE(ash::WmShell::Get()->GetAppListTargetVisibility());
   EXPECT_TRUE(omnibox->GetNativeView()->HasFocus());
 
   // Verify caret moved to the beginning.
   omnibox->GetSelectionBounds(&start, &end);
   ASSERT_EQ(0U, start);
   ASSERT_EQ(0U, end);
 }
 
 IN_PROC_BROWSER_TEST_F(StickyKeysBrowserTest, OverlayShown) {
   const ui::KeyboardCode modifier_keys[] = { ui::VKEY_CONTROL,
@@ skipping 27 matching lines @@
   EXPECT_TRUE(sticky_keys_overlay->is_visible());
   DisableStickyKeys();
   EXPECT_FALSE(controller->GetOverlayForTest());
   for (auto key_code : modifier_keys) {
     SendKeyPress(key_code);
     EXPECT_FALSE(controller->GetOverlayForTest());
   }
 }
 
 }  // namespace chromeos