Move yet more from WmShell to Shell

ash/system/overview/overview_button_tray_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/system/overview/overview_button_tray.h"
 
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_controller.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
@@ skipping 56 matching lines @@
 };
 
 void OverviewButtonTrayTest::SetUp() {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       ::switches::kUseFirstDisplayAsInternal);
   AshTestBase::SetUp();
 }
 
 void OverviewButtonTrayTest::NotifySessionStateChanged() {
   GetTray()->SessionStateChanged(
-      WmShell::Get()->session_controller()->GetSessionState());
+      Shell::Get()->session_controller()->GetSessionState());
 }
 
 // Ensures that creation doesn't cause any crashes and adds the image icon.
 TEST_F(OverviewButtonTrayTest, BasicConstruction) {
   EXPECT_TRUE(GetImageView(GetTray()) != NULL);
 }
 
 // Test that maximize mode toggle changes visibility.
 // OverviewButtonTray should only be visible when MaximizeMode is enabled.
 // By default the system should not have MaximizeMode enabled.
@@ skipping 78 matching lines @@
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
 }
 
 // Tests that the tray loses visibility when a user logs out, and that it
 // regains visibility when a user logs back in.
 TEST_F(OverviewButtonTrayTest, VisibilityChangesForLoginStatus) {
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   SetUserLoggedIn(false);
-  WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::NOT_LOGGED_IN);
+  Shell::Get()->UpdateAfterLoginStatusChange(LoginStatus::NOT_LOGGED_IN);
   EXPECT_FALSE(GetTray()->visible());
   SetUserLoggedIn(true);
   SetSessionStarted(true);
-  WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
+  Shell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
   EXPECT_TRUE(GetTray()->visible());
   SetUserAddingScreenRunning(true);
   NotifySessionStateChanged();
   EXPECT_FALSE(GetTray()->visible());
   SetUserAddingScreenRunning(false);
   NotifySessionStateChanged();
   EXPECT_TRUE(GetTray()->visible());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
 }
@@ skipping 63 matching lines @@
   ASSERT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(GetTray()->visible());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(GetTray()->visible());
 }
 
 }  // namespace ash