Enable display rotation, magnifier in unified desktop mode

ash/magnifier/magnification_controller_unittest.cc

 // Copyright (c) 2013 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/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"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_utils.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/chromeos/accessibility_types.h"
 #include "ui/events/test/event_generator.h"
@@ skipping 558 matching lines @@
   generator.ReleaseKey(ui::VKEY_A, 0);
   gfx::Rect caret_bounds = GetCaretBounds();
   EXPECT_FALSE(view_port.Intersects(caret_bounds));
 
   gfx::Rect new_view_port = GetViewport();
   EXPECT_TRUE(new_view_port.Contains(caret_bounds));
   EXPECT_EQ(caret_bounds.x(), new_view_port.CenterPoint().x());
   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