Folds methods in WmShellCommon to WmShell

ash/wm/window_cycle_controller.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 "ash/wm/window_cycle_controller.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
@@ skipping 68 matching lines @@
     return;
 
   if (!IsCycling())
     StartCycling();
 
   Step(direction);
 }
 
 void WindowCycleController::StartCycling() {
   MruWindowTracker::WindowList window_list =
-      Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList();
+      WmShell::Get()->mru_window_tracker()->BuildMruWindowList();
 
   active_window_before_window_cycle_ = GetActiveWindow(window_list);
 
   window_cycle_list_.reset(new WindowCycleList(window_list));
   event_handler_.reset(new WindowCycleEventFilter());
   cycle_start_time_ = base::Time::Now();
   WmShell::Get()->RecordUserMetricsAction(UMA_WINDOW_CYCLE);
   UMA_HISTOGRAM_COUNTS_100("Ash.WindowCycleController.Items",
                            window_list.size());
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // WindowCycleController, private:
 
 void WindowCycleController::Step(Direction direction) {
   DCHECK(window_cycle_list_.get());
   window_cycle_list_->Step(direction);
 }
 
 void WindowCycleController::StopCycling() {
   UMA_HISTOGRAM_COUNTS_100("Ash.WindowCycleController.SelectionDepth",
                            window_cycle_list_->current_index() + 1);
   window_cycle_list_.reset();
 
   WmWindow* active_window_after_window_cycle = GetActiveWindow(
-      Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
+      WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
 
   // Remove our key event filter.
   event_handler_.reset();
   UMA_HISTOGRAM_MEDIUM_TIMES("Ash.WindowCycleController.CycleTime",
                              base::Time::Now() - cycle_start_time_);
 
   if (active_window_after_window_cycle != nullptr &&
       active_window_before_window_cycle_ != active_window_after_window_cycle) {
     Shell::GetInstance()
         ->metrics()
         ->task_switch_metrics_recorder()
         .OnTaskSwitch(TaskSwitchMetricsRecorder::WINDOW_CYCLE_CONTROLLER);
   }
   active_window_before_window_cycle_ = nullptr;
 }
 
 }  // namespace ash