chromeos: Promotes more from WmShell to Shell

ash/wm/lock_state_controller_unittest.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 "ash/wm/lock_state_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 70 matching lines @@
     test_animator_ = new TestSessionStateAnimator;
 
     lock_state_controller_ = Shell::GetInstance()->lock_state_controller();
     lock_state_controller_->set_animator_for_test(test_animator_);
 
     test_api_.reset(new LockStateControllerTestApi(lock_state_controller_));
     test_api_->set_shutdown_controller(&test_shutdown_controller_);
 
     power_button_controller_ = Shell::GetInstance()->power_button_controller();
 
-    shell_delegate_ =
-        static_cast<TestShellDelegate*>(WmShell::Get()->delegate());
+    shell_delegate_ = static_cast<TestShellDelegate*>(Shell::Get()->delegate());
   }
 
   void TearDown() override {
     const bool is_mash = WmShell::Get()->IsRunningInMash();
     AshTestBase::TearDown();
     // Mash shuts down DBus during normal destruction.
     if (!is_mash)
       chromeos::DBusThreadManager::Shutdown();
   }
 
@@ skipping 971 matching lines @@
   ASSERT_EQ(0, delegate->handle_take_screenshot_count());
   PressVolumeDown();
   PressPowerButton();
   ReleasePowerButton();
   ReleaseVolumeDown();
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
 }
 
 }  // namespace test
 }  // namespace ash