Promotes more accessors from WmShell to Shell

chrome/browser/ui/ash/multi_user/user_switch_util_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 "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"
 
 namespace ash {
 
 class TrySwitchingUserTest : public ash::test::AshTestBase {
  public:
   // The action type to perform / check for upon user switching.
   enum ActionType {
     NO_DIALOG,       // No dialog should be shown.
@@ skipping 52 matching lines @@
         FROM_HERE, base::Bind(&CloseMessageBox, action));
     TrySwitchingActiveUser(base::Bind(&TrySwitchingUserTest::SwitchCallback,
                                       base::Unretained(this)));
     base::RunLoop().RunUntilIdle();
   }
 
   // Called when the user will get actually switched.
   void SwitchCallback() { switch_callback_hit_count_++; }
 
   // 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*>(
         const_cast<const TrySwitchingUserTest*>(this)
             ->window_selector_controller());
   }
   bool ToggleOverview() {
     return window_selector_controller()->ToggleOverview();
   }
   bool IsSelecting() const {
@@ skipping 148 matching lines @@
   gfx::Rect bounds(0, 0, 100, 100);
   std::unique_ptr<aura::Window> w(CreateTestWindowInShellWithBounds(bounds));
   ASSERT_TRUE(ToggleOverview());
   ASSERT_TRUE(IsSelecting());
   SwitchUser(TrySwitchingUserTest::NO_DIALOG);
   ASSERT_FALSE(IsSelecting());
   EXPECT_EQ(1, switch_callback_hit_count());
 }
 
 }  // namespace ash