Enable display rotation, magnifier in unified desktop mode

ash/display/display_manager_unittest.cc

 // Copyright (c) 2012 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/display/display_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
@@ skipping 1444 matching lines @@
   EXPECT_EQ("300x400", host1->GetBounds().size().ToString());
 
   UpdateDisplay("100+200-100x200,300+500-200x300");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   EXPECT_EQ("100,200", host0->GetBounds().origin().ToString());
   EXPECT_EQ("100x200", host0->GetBounds().size().ToString());
   EXPECT_EQ("300,500", host1->GetBounds().origin().ToString());
   EXPECT_EQ("200x300", host1->GetBounds().size().ToString());
 }
 
-#if !defined(OS_WIN) && defined(USE_X11)
+TEST_F(DisplayManagerTest, UnifiedDesktopBasic) {
+  if (!SupportsMultipleDisplays())
+    return;
 
-TEST_F(DisplayManagerTest, UnifiedDesktopBasic) {
-  test::DisplayManagerTestApi test_api(display_manager());
-  test_api.SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
+  display_manager()->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
   display_manager()->SetMultiDisplayMode(DisplayManager::UNIFIED);
   UpdateDisplay("300x200,400x500");
 
   gfx::Screen* screen =
       gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
   EXPECT_EQ("700x500", screen->GetPrimaryDisplay().size().ToString());
 
   display_manager()->SetMirrorMode(true);
   EXPECT_EQ("300x200", screen->GetPrimaryDisplay().size().ToString());
 
   display_manager()->SetMirrorMode(false);
   EXPECT_EQ("700x500", screen->GetPrimaryDisplay().size().ToString());
 
   // Swithc to single desktop.
   UpdateDisplay("500x300");
   EXPECT_EQ("500x300", screen->GetPrimaryDisplay().size().ToString());
 
   // Swithc to unified desktop.
   UpdateDisplay("500x300,400x500");
   EXPECT_EQ("900x500", screen->GetPrimaryDisplay().size().ToString());
 }
 
+// TODO(oshima): Fix this
+#if !defined(USE_OZONE)

[oshima, 2015/05/01 20:58:16]

here

+TEST_F(DisplayManagerTest, RotateUnifiedDesktop) {
+  if (!SupportsMultipleDisplays())
+    return;
+
+  display_manager()->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
+  display_manager()->SetMultiDisplayMode(DisplayManager::UNIFIED);
+  UpdateDisplay("300x200,400x500");
+
+  gfx::Screen* screen =
+      gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
+  const gfx::Display& display = screen->GetPrimaryDisplay();
+  EXPECT_EQ("700x500", display.size().ToString());
+  display_manager()->SetDisplayRotation(display.id(), gfx::Display::ROTATE_90,
+                                        gfx::Display::ROTATION_SOURCE_ACTIVE);
+  EXPECT_EQ("500x700", screen->GetPrimaryDisplay().size().ToString());
+  display_manager()->SetDisplayRotation(display.id(), gfx::Display::ROTATE_0,
+                                        gfx::Display::ROTATION_SOURCE_ACTIVE);
+  EXPECT_EQ("700x500", screen->GetPrimaryDisplay().size().ToString());
+}
 #endif
 
 class ScreenShutdownTest : public test::AshTestBase {
  public:
   ScreenShutdownTest() {
   }
   ~ScreenShutdownTest() override {}
 
   void TearDown() override {
     gfx::Screen* orig_screen =
@@ skipping 143 matching lines @@
       1.25f, Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_TRUE(IsTextSubpixelPositioningEnabled());
   EXPECT_EQ(gfx::FontRenderParams::HINTING_NONE, GetFontHintingParams());
 
   DisplayInfo::SetUse125DSFForUIScaling(false);
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash