Move MaximizeModeWindowManager to the controller

ash/wm/maximize_mode/maximize_mode_controller_unittest.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/maximize_mode/maximize_mode_controller.h"
 
 #include "ash/accelerometer/accelerometer_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 95 matching lines @@
     test::DisplayManagerTestApi(Shell::GetInstance()->display_manager()).
         SetFirstDisplayAsInternalDisplay();
   }
 
   virtual void TearDown() OVERRIDE {
     Shell::GetInstance()->accelerometer_controller()->AddObserver(
         maximize_mode_controller());
     test::AshTestBase::TearDown();
   }
 
-  MaximizeModeController* maximize_mode_controller() {
+  MaximizeModeController* maximize_mode_controller() const {

[flackr, 2014/05/29 16:10:06]

How about const and non-const versions which return a const or non const
pointer?

See for example Window::GetRootWindow. Although the implementation is short
enough you can do it twice instead of a const cast.

[jonross, 2014/05/29 17:40:00]

Removed the original const on 1125 to clear the need here. That way there is no
const/non-const mix up with the pointer.

     return Shell::GetInstance()->maximize_mode_controller();
   }
 
   void TriggerAccelerometerUpdate(const gfx::Vector3dF& base,
                                   const gfx::Vector3dF& lid) {
     maximize_mode_controller()->OnAccelerometerUpdated(base, lid);
   }
 
   bool IsMaximizeModeStarted() const {
-    return Shell::GetInstance()->IsMaximizeModeWindowManagerEnabled();
+    return maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled();
   }
 
   // Overrides the internal input device list for the current event targeters
   // with one which always returns true.
   void InstallTestInternalDeviceList() {
     maximize_mode_controller()->event_blocker_->internal_devices_.reset(
         new TestInternalInputDeviceList);
   }
 
   gfx::Display::Rotation GetInternalDisplayRotation() const {
@@ skipping 476 matching lines @@
   EXPECT_EQ(gfx::Display::ROTATE_180, GetInternalDisplayRotation());
 
   // Exit maximize mode
   TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, 1.0f),
                              gfx::Vector3dF(-1.0f, 0.0f, 0.0f));
   EXPECT_FALSE(IsMaximizeModeStarted());
   EXPECT_EQ(gfx::Display::ROTATE_90, GetInternalDisplayRotation());
 }
 
 }  // namespace ash