Promotes more accessors from WmShell to Shell

chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc

Index: chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc b/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
index 6182167c8d953c502bdb84efb38c2f5de886fe95..85e8042abd08c1705ac3dd6ef00c865997014a0b 100644
--- a/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/ui/ash/multi_user/user_switch_util.h"

[msw, 2017/03/24 22:46:17]

nit: blank line after

[sky, 2017/03/24 23:22:29]

git cl format does this, but didn't add the newline. Will have to file a bug on
it.

 #include "ash/common/system/chromeos/screen_security/screen_tray_item.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chrome/browser/ui/ash/multi_user/user_switch_util.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "ui/aura/window.h"
 
@@ -83,7 +83,7 @@ class TrySwitchingUserTest : public ash::test::AshTestBase {
 
   // Methods needed to test with overview mode.
   const WindowSelectorController* window_selector_controller() const {

[msw, 2017/03/24 22:46:17]

optional nit: inline these accessors (just two uses below...)

[sky, 2017/03/24 23:22:29]

Done.

-    return WmShell::Get()->window_selector_controller();
+    return Shell::Get()->window_selector_controller();
   }
   WindowSelectorController* window_selector_controller() {
     return const_cast<WindowSelectorController*>(