Folds methods in WmShellCommon to WmShell

ash/wm/panels/panel_layout_manager_unittest.cc

 // Copyright (c) 2012 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/panels/panel_layout_manager.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_test_api.h"
@@ skipping 702 matching lines @@
   // we exit fullscreen mode.
   w3.reset(CreatePanelWindow(bounds));
 
   EXPECT_FALSE(w1->IsVisible());
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
 
   // While in full-screen mode, the panel windows should still be in the
   // switchable window list - http://crbug.com/313919.
   aura::Window::Windows switchable_window_list = WmWindowAura::ToAuraWindows(
-      Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
+      WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
   EXPECT_EQ(3u, switchable_window_list.size());
   EXPECT_NE(switchable_window_list.end(),
             std::find(switchable_window_list.begin(),
                       switchable_window_list.end(), w1.get()));
   EXPECT_NE(switchable_window_list.end(),
             std::find(switchable_window_list.begin(),
                       switchable_window_list.end(), w2.get()));
   EXPECT_NE(switchable_window_list.end(),
             std::find(switchable_window_list.begin(),
                       switchable_window_list.end(), w3.get()));
@@ skipping 60 matching lines @@
   touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_NE(w.get(), target);
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl,
                         PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace ash