Folds methods in WmShellCommon to WmShell

ash/aura/wm_shell_aura.cc

Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index ba029b59a483bffb40787bee61bf4271c227623c..98f8c064052b2b9e2573708b19a28d515ed6c9d4 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -11,7 +11,6 @@
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
-#include "ash/common/wm_shell_common.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
@@ -30,8 +29,7 @@
 
 namespace ash {
 
-WmShellAura::WmShellAura(WmShellCommon* wm_shell_common)
-    : wm_shell_common_(wm_shell_common) {
+WmShellAura::WmShellAura() {
   WmShell::Set(this);
 }
 
@@ -47,10 +45,6 @@ void WmShellAura::PrepareForShutdown() {
     Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
 }
 
-MruWindowTracker* WmShellAura::GetMruWindowTracker() {
-  return wm_shell_common_->mru_window_tracker();
-}
-
 WmWindow* WmShellAura::NewContainerWindow() {
   aura::Window* aura_window = new aura::Window(nullptr);
   aura_window->Init(ui::LAYER_NOT_DRAWN);
@@ -135,13 +129,12 @@ WmShellAura::CreateMaximizeModeEventHandler() {
 }
 
 void WmShellAura::OnOverviewModeStarting() {
-  FOR_EACH_OBSERVER(ShellObserver, *wm_shell_common_->shell_observers(),
+  FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
                     OnOverviewModeStarting());
 }
 
 void WmShellAura::OnOverviewModeEnded() {
-  FOR_EACH_OBSERVER(ShellObserver, *wm_shell_common_->shell_observers(),
-                    OnOverviewModeEnded());
+  FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded());
 }
 
 AccessibilityDelegate* WmShellAura::GetAccessibilityDelegate() {
@@ -176,14 +169,6 @@ void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) {
   display_observers_.RemoveObserver(observer);
 }
 
-void WmShellAura::AddShellObserver(ShellObserver* observer) {
-  wm_shell_common_->AddShellObserver(observer);
-}
-
-void WmShellAura::RemoveShellObserver(ShellObserver* observer) {
-  wm_shell_common_->RemoveShellObserver(observer);
-}
-
 void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher) {
   Shell::GetInstance()->AddPointerWatcher(watcher);
 }