Move even more from WmShell to Shell

ash/common/wm/mru_window_tracker_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/common/wm/mru_window_tracker.h"
 
 #include "ash/common/test/ash_test.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/shell.h"
 #include "ui/base/hit_test.h"
 
 namespace ash {
 
 class MruWindowTrackerTest : public AshTest {
  public:
   MruWindowTrackerTest() {}
   ~MruWindowTrackerTest() override {}
 
   std::unique_ptr<WindowOwner> CreateTestWindow() {
     return AshTest::CreateTestWindow(gfx::Rect(0, 0, 400, 400));
   }
 
   MruWindowTracker* mru_window_tracker() {
-    return WmShell::Get()->mru_window_tracker();
+    return Shell::Get()->mru_window_tracker();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MruWindowTrackerTest);
 };
 
 // Basic test that the activation order is tracked.
 TEST_F(MruWindowTrackerTest, Basic) {
   std::unique_ptr<WindowOwner> w1_owner(CreateTestWindow());
   WmWindow* w1 = w1_owner->window();
@@ skipping 66 matching lines @@
   drag_container->AddChild(w1);
   EXPECT_TRUE(w1->GetWindowState()->is_dragged());
 
   // The dragged window should only be in the list once.
   WmWindow::Windows window_list =
       mru_window_tracker()->BuildWindowListIgnoreModal();
   EXPECT_EQ(1, std::count(window_list.begin(), window_list.end(), w1));
 }
 
 }  // namespace ash