Move MaximizeModeWindowManager to the controller

chrome/browser/chromeos/display/display_preferences_unittest.cc

Index: chrome/browser/chromeos/display/display_preferences_unittest.cc
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
index 7d889f04103dc7d0473d4df0b2126445d946f4b7..21e532d57f432b17c756db2ae9255c24041434fc 100644
--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/chromeos/display/display_preferences.h"
 
+#include <string>
+#include <vector>
+

[jonross, 2014/05/29 15:24:42]

cpplint

 #include "ash/display/display_controller.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
@@ -641,7 +644,7 @@ TEST_F(DisplayPreferencesTest, DontSaveMaximizeModeControllerRotations) {
   // Open up 270 degrees to trigger maximize mode
   controller->OnAccelerometerUpdated(gfx::Vector3dF(0.0f, 0.0f, -1.0f),
                                      gfx::Vector3dF(-1.0f, 0.0f, 0.0f));
-  EXPECT_TRUE(shell->IsMaximizeModeWindowManagerEnabled());
+  EXPECT_TRUE(controller->IsMaximizeModeWindowManagerEnabled());
 
   // Trigger 90 degree rotation
   controller->OnAccelerometerUpdated(gfx::Vector3dF(0.0f, 1.0f, 0.0f),