Promotes more accessors from WmShell to Shell

ash/wm/maximize_mode/maximize_mode_window_manager_unittest.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 "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
 
 #include <string>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 1257 matching lines @@
 TEST_F(MaximizeModeWindowManagerTest, ExitsOverview) {
   // Bounds for windows we know can be controlled.
   gfx::Rect rect1(10, 10, 200, 50);
   gfx::Rect rect2(10, 60, 200, 50);
   std::unique_ptr<aura::Window> w1(
       CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect1));
   std::unique_ptr<aura::Window> w2(
       CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect2));
 
   WindowSelectorController* window_selector_controller =
-      WmShell::Get()->window_selector_controller();
+      Shell::Get()->window_selector_controller();
   ASSERT_TRUE(window_selector_controller->ToggleOverview());
   ASSERT_TRUE(window_selector_controller->IsSelecting());
   MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager();
   ASSERT_TRUE(manager);
   EXPECT_FALSE(window_selector_controller->IsSelecting());
 
   ASSERT_TRUE(window_selector_controller->ToggleOverview());
   ASSERT_TRUE(window_selector_controller->IsSelecting());
   // Destroy the manager again and check that the windows return to their
   // previous state.
@@ skipping 408 matching lines @@
   EXPECT_EQ(1, observer.GetPostCountAndReset());
   EXPECT_EQ(wm::WINDOW_STATE_TYPE_MINIMIZED,
             observer.GetLastOldStateAndReset());
 
   window_state->RemoveObserver(&observer);
 
   DestroyMaximizeModeWindowManager();
 }
 
 }  // namespace ash