Move yet more from WmShell to Shell

ash/system/chromeos/power/tablet_power_button_controller_unittest.cc

 // Copyright 2016 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/chromeos/power/tablet_power_button_controller.h"
 
 #include <memory>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_controller.h"
@@ skipping 94 matching lines @@
 
   void EnableMaximizeMode(bool enabled) {
     Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
         enabled);
   }
 
   bool GetLockedState() {
     // LockScreen is an async mojo call. Spin message loop to ensure it is
     // delivered.
     SessionController* const session_controller =
-        WmShell::Get()->session_controller();
+        Shell::Get()->session_controller();
     session_controller->FlushMojoForTest();
     return session_controller->IsScreenLocked();
   }
 
   bool GetBacklightsForcedOff() WARN_UNUSED_RESULT {
     bool forced_off = false;
     power_manager_client_->GetBacklightsForcedOff(
         base::Bind(&CopyResult, base::Unretained(&forced_off)));
     base::RunLoop().RunUntilIdle();
     return forced_off;
@@ skipping 352 matching lines @@
   // Test that after another long duration, backlights should be forced off.
   tick_clock_->Advance(base::TimeDelta::FromMilliseconds(800));
   power_manager_client_->SendPowerButtonEvent(true, tick_clock_->NowTicks());
   power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());
   power_manager_client_->SendBrightnessChanged(0, false);
   EXPECT_TRUE(GetBacklightsForcedOff());
 }
 
 }  // namespace test
 }  // namespace ash