Folds methods in WmShellCommon to WmShell

ash/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/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 class MruWindowTrackerTest : public test::AshTestBase {
  public:
   MruWindowTrackerTest() {}
   ~MruWindowTrackerTest() override {}
 
   aura::Window* CreateWindow() {
     return CreateTestWindowInShellWithBounds(gfx::Rect(0, 0, 400, 400));
   }
 
   ash::MruWindowTracker* mru_window_tracker() {
-    return Shell::GetInstance()->mru_window_tracker();
+    return WmShell::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<aura::Window> w1(CreateWindow());
   std::unique_ptr<aura::Window> w2(CreateWindow());
@@ skipping 82 matching lines @@
       WmWindowAura::ToAuraWindows(mru_window_tracker()->BuildMruWindowList());
 
   EXPECT_EQ(window_list.end(),
             std::find(window_list.begin(), window_list.end(), w1.get()));
   EXPECT_EQ(window_list.end(),
             std::find(window_list.begin(), window_list.end(), w3.get()));
   EXPECT_EQ(1u, window_list.size());
 }
 
 }  // namespace ash