Enable display rotation, magnifier in unified desktop mode

ash/magnifier/magnification_controller_unittest.cc

Index: ash/magnifier/magnification_controller_unittest.cc
diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc
index f6425fffbef41490041bb0a42c5248d3f1e361c1..ef73e7b647af6afb46026c80105e017d21428b59 100644
--- a/ash/magnifier/magnification_controller_unittest.cc
+++ b/ash/magnifier/magnification_controller_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/magnifier/magnification_controller.h"
 
+#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/strings/stringprintf.h"
@@ -582,4 +583,37 @@ TEST_F(MagnificationControllerTest, FollowTextInputFieldKeyPress) {
   EXPECT_EQ(view_port.y(), new_view_port.y());
 }
 
+// Make sure that unified desktop can enter magnified mode.
+TEST_F(MagnificationControllerTest, EnableMagnifierInUnifiedDesktop) {
+  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display_manager->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
+  display_manager->SetMultiDisplayMode(DisplayManager::UNIFIED);
+
+  EXPECT_EQ(1.0f, GetMagnificationController()->GetScale());
+
+  GetMagnificationController()->SetEnabled(true);
+
+  gfx::Screen* screen =
+      gfx::Screen::GetScreenFor(Shell::GetPrimaryRootWindow());
+
+  UpdateDisplay("500x500, 500x500");
+  EXPECT_EQ("0,0 1000x500", screen->GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ(2.0f, GetMagnificationController()->GetScale());
+
+  GetMagnificationController()->SetEnabled(false);
+
+  EXPECT_EQ(1.0f, GetMagnificationController()->GetScale());
+
+  GetMagnificationController()->SetEnabled(true);
+  EXPECT_EQ(2.0f, GetMagnificationController()->GetScale());
+
+  UpdateDisplay("500x500");
+  EXPECT_EQ("0,0 500x500", screen->GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ(2.0f, GetMagnificationController()->GetScale());
+
+  GetMagnificationController()->SetEnabled(false);
+  EXPECT_EQ("0,0 500x500", screen->GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ(1.0f, GetMagnificationController()->GetScale());
+}
+
 }  // namespace ash