Move yet more from WmShell to Shell

ash/system/chromeos/power/power_event_observer.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/system/chromeos/power/power_event_observer.h"
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
@@ skipping 58 matching lines @@
     screen_lock_callback_.Reset();
   }
 }
 
 void PowerEventObserver::BrightnessChanged(int level, bool user_initiated) {
   Shell::GetInstance()->power_button_controller()->OnScreenBrightnessChanged(
       static_cast<double>(level));
 }
 
 void PowerEventObserver::SuspendImminent() {
-  SessionController* controller = WmShell::Get()->session_controller();
+  SessionController* controller = Shell::Get()->session_controller();
 
   // This class is responsible for disabling all rendering requests at suspend
   // time and then enabling them at resume time.  When the
   // auto-screen-lock pref is not set this is easy to do since
   // StopRenderingRequests() is just called directly from this function.  If the
   // auto-screen-lock pref _is_ set, then the suspend needs to be delayed
   // until the lock screen is fully visible.  While it is sufficient from a
   // security perspective to block only until the lock screen is ready, which
   // guarantees that the contents of the user's screen are no longer visible,
   // this leads to poor UX on the first resume since neither the user pod nor
@@ skipping 66 matching lines @@
   } else {
     VLOG(1) << "Screen locked without suspend";
   }
 }
 
 void PowerEventObserver::ScreenIsUnlocked() {
   screen_locked_ = false;
 }
 
 }  // namespace ash