Specify a default display UI scale to reset the zoom to

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/accelerators/accelerator_commands_aura.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/display/display_configuration_controller.h"
@@ skipping 1118 matching lines @@
             post_rotation_info.GetActiveRotation());
 }
 
 // TODO(msw): Broken on Windows. http://crbug.com/584038
 #if defined(OS_CHROMEOS)
 TEST_P(DisplayManagerTest, UIScale) {
   test::ScopedDisable125DSFForUIScaling disable;
 
   UpdateDisplay("1280x800");
   int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
-  display_manager()->SetDisplayUIScale(display_id, 1.125f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.125f);
   EXPECT_EQ(1.0, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.8f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.8f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.75f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.75f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.625f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.625f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
 
   test::ScopedSetInternalDisplayId set_internal(display_manager(), display_id);
 
-  display_manager()->SetDisplayUIScale(display_id, 1.5f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.5f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 1.25f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.25f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 1.125f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.125f);
   EXPECT_EQ(1.125f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.8f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.8f);
   EXPECT_EQ(0.8f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.75f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.75f);
   EXPECT_EQ(0.8f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.625f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.625f);
   EXPECT_EQ(0.625f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.6f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.6f);
   EXPECT_EQ(0.625f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.5f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.5f);
   EXPECT_EQ(0.5f, GetDisplayInfoAt(0).configured_ui_scale());
 
   UpdateDisplay("1366x768");
-  display_manager()->SetDisplayUIScale(display_id, 1.5f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.5f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 1.25f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.25f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 1.125f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.125f);
   EXPECT_EQ(1.125f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.8f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.8f);
   EXPECT_EQ(1.125f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.75f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.75f);
   EXPECT_EQ(0.75f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.6f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.6f);
   EXPECT_EQ(0.6f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.625f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.625f);
   EXPECT_EQ(0.6f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.5f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.5f);
   EXPECT_EQ(0.5f, GetDisplayInfoAt(0).configured_ui_scale());
 
   UpdateDisplay("1280x850*2");
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 1.5f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.5f);
   EXPECT_EQ(1.5f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 1.25f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.25f);
   EXPECT_EQ(1.25f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 1.125f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.125f);
   EXPECT_EQ(1.125f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 1.0f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.0f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
   display::Display display = display::Screen::GetScreen()->GetPrimaryDisplay();
   EXPECT_EQ(2.0f, display.device_scale_factor());
   EXPECT_EQ("640x425", display.bounds().size().ToString());
 
-  display_manager()->SetDisplayUIScale(display_id, 0.8f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.8f);
   EXPECT_EQ(0.8f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.75f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.75f);
   EXPECT_EQ(0.8f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.625f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.625f);
   EXPECT_EQ(0.625f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.6f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.6f);
   EXPECT_EQ(0.625f, GetDisplayInfoAt(0).configured_ui_scale());
-  display_manager()->SetDisplayUIScale(display_id, 0.5f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.5f);
   EXPECT_EQ(0.5f, GetDisplayInfoAt(0).configured_ui_scale());
 
-  display_manager()->SetDisplayUIScale(display_id, 2.0f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 2.0f);
   EXPECT_EQ(2.0f, GetDisplayInfoAt(0).configured_ui_scale());
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveUIScale());
   display = display::Screen::GetScreen()->GetPrimaryDisplay();
   EXPECT_EQ(1.0f, display.device_scale_factor());
   EXPECT_EQ("1280x850", display.bounds().size().ToString());
 
   // 1.25 ui scaling on 1.25 DSF device should use 1.0 DSF
   // on screen.
   UpdateDisplay("1280x850*1.25");
-  display_manager()->SetDisplayUIScale(display_id, 1.25f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.25f);
   EXPECT_EQ(1.25f, GetDisplayInfoAt(0).configured_ui_scale());
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveUIScale());
   display = display::Screen::GetScreen()->GetPrimaryDisplay();
   EXPECT_EQ(1.0f, display.device_scale_factor());
   EXPECT_EQ("1280x850", display.bounds().size().ToString());
 }
 #endif  // defined(OS_CHROMEOS)
 
 TEST_P(DisplayManagerTest, UIScaleWithDisplayMode) {
   int display_id = 1000;
@@ skipping 11 matching lines @@
   std::vector<display::ManagedDisplayInfo> display_info_list;
   display_info_list.push_back(native_display_info);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
 
   scoped_refptr<display::ManagedDisplayMode> expected_mode = base_mode;
   EXPECT_TRUE(expected_mode->IsEquivalent(
       display_manager()->GetActiveModeForDisplayId(display_id)));
 
   test::ScopedSetInternalDisplayId set_internal(display_manager(), display_id);
 
-  display_manager()->SetDisplayUIScale(display_id, 1.5f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.5f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
   EXPECT_TRUE(expected_mode->IsEquivalent(
       display_manager()->GetActiveModeForDisplayId(display_id)));
-  display_manager()->SetDisplayUIScale(display_id, 1.25f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.25f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).configured_ui_scale());
   EXPECT_TRUE(expected_mode->IsEquivalent(
       display_manager()->GetActiveModeForDisplayId(display_id)));
-  display_manager()->SetDisplayUIScale(display_id, 1.125f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.125f);
   EXPECT_EQ(1.125f, GetDisplayInfoAt(0).configured_ui_scale());
 
   expected_mode = new display::ManagedDisplayMode(
       expected_mode->size(), expected_mode->refresh_rate(),
       expected_mode->is_interlaced(), expected_mode->native(),
       1.125f /* ui_scale */, expected_mode->device_scale_factor());
 
   EXPECT_TRUE(expected_mode->IsEquivalent(
       display_manager()->GetActiveModeForDisplayId(display_id)));
-  display_manager()->SetDisplayUIScale(display_id, 0.8f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.8f);
   EXPECT_EQ(0.8f, GetDisplayInfoAt(0).configured_ui_scale());
 
   expected_mode = new display::ManagedDisplayMode(
       expected_mode->size(), expected_mode->refresh_rate(),
       expected_mode->is_interlaced(), expected_mode->native(),
       0.8f /* ui_scale */, expected_mode->device_scale_factor());
 
   EXPECT_TRUE(expected_mode->IsEquivalent(
       display_manager()->GetActiveModeForDisplayId(display_id)));
-  display_manager()->SetDisplayUIScale(display_id, 0.75f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.75f);
   EXPECT_EQ(0.8f, GetDisplayInfoAt(0).configured_ui_scale());
   EXPECT_TRUE(expected_mode->IsEquivalent(
       display_manager()->GetActiveModeForDisplayId(display_id)));
-  display_manager()->SetDisplayUIScale(display_id, 0.625f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.625f);
   EXPECT_EQ(0.625f, GetDisplayInfoAt(0).configured_ui_scale());
 
   expected_mode = new display::ManagedDisplayMode(
       expected_mode->size(), expected_mode->refresh_rate(),
       expected_mode->is_interlaced(), expected_mode->native(),
       0.625f /* ui_scale */, expected_mode->device_scale_factor());
 
   EXPECT_TRUE(expected_mode->IsEquivalent(
       display_manager()->GetActiveModeForDisplayId(display_id)));
-  display_manager()->SetDisplayUIScale(display_id, 0.6f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.6f);
   EXPECT_EQ(0.625f, GetDisplayInfoAt(0).configured_ui_scale());
   EXPECT_TRUE(expected_mode->IsEquivalent(
       display_manager()->GetActiveModeForDisplayId(display_id)));
-  display_manager()->SetDisplayUIScale(display_id, 0.5f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.5f);
   EXPECT_EQ(0.5f, GetDisplayInfoAt(0).configured_ui_scale());
 
   expected_mode = new display::ManagedDisplayMode(
       expected_mode->size(), expected_mode->refresh_rate(),
       expected_mode->is_interlaced(), expected_mode->native(),
       0.5f /* ui_scale */, expected_mode->device_scale_factor());
 
   EXPECT_TRUE(expected_mode->IsEquivalent(
       display_manager()->GetActiveModeForDisplayId(display_id)));
 }
 
+// Tests that ResetInternalDisplayZoom() resets to the default 0.8f UI scale
+// defined for the 1.25x displays.
+TEST_P(DisplayManagerTest, ResetInternalDisplayZoomFor1_25x) {
+  // Setup the display modes with UI-scale.
+  const scoped_refptr<display::ManagedDisplayMode> base_mode(
+      new display::ManagedDisplayMode(gfx::Size(1920, 1080), 60.0f,
+                                      false /* is_interlaced */,
+                                      true /* native */, 1.0f /* ui_scale */,
+                                      1.25f /* device_scale_factor */));
+  display::ManagedDisplayInfo::ManagedDisplayModeList mode_list =
+      CreateInternalManagedDisplayModeList(base_mode);
+
+  const int display_id = 1000;
+  display::ManagedDisplayInfo native_display_info =
+      CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1920, 1080));
+  native_display_info.set_device_scale_factor(1.25f);
+  native_display_info.SetManagedDisplayModes(mode_list);
+
+  std::vector<display::ManagedDisplayInfo> display_info_list;
+  display_info_list.push_back(native_display_info);
+  display_manager()->OnNativeDisplaysChanged(display_info_list);
+
+  scoped_refptr<display::ManagedDisplayMode> expected_mode = base_mode;
+  EXPECT_TRUE(expected_mode->IsEquivalent(
+      display_manager()->GetActiveModeForDisplayId(display_id)));
+
+  test::ScopedSetInternalDisplayId set_internal(display_manager(), display_id);
+
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.5f);
+  EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveDeviceScaleFactor());
+  EXPECT_EQ(0.5f, GetDisplayInfoAt(0).GetEffectiveUIScale());
+  EXPECT_EQ(0.5f, GetDisplayInfoAt(0).configured_ui_scale());
+  EXPECT_EQ("960x540", GetDisplayForId(display_id).size().ToString());
+
+  // Reset the internal display zoom and expect the UI scale to go to the
+  // default 0.8f.
+  display_manager()->ResetInternalDisplayZoom();
+  EXPECT_EQ(1.25f, GetDisplayInfoAt(0).GetEffectiveDeviceScaleFactor());
+  EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveUIScale());
+  EXPECT_EQ(0.8f, GetDisplayInfoAt(0).configured_ui_scale());
+  EXPECT_EQ("1536x864", GetDisplayForId(display_id).size().ToString());
+}
+
 // TODO(msw): Broken on Windows. http://crbug.com/584038
 #if defined(OS_CHROMEOS)
 TEST_P(DisplayManagerTest, Use125DSFForUIScaling) {
   int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
 
   test::ScopedSetInternalDisplayId set_internal(display_manager(), display_id);
   UpdateDisplay("1920x1080*1.25");
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveDeviceScaleFactor());
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveUIScale());
 
-  display_manager()->SetDisplayUIScale(display_id, 0.8f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.8f);
   EXPECT_EQ(1.25f, GetDisplayInfoAt(0).GetEffectiveDeviceScaleFactor());
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveUIScale());
   EXPECT_EQ("1536x864", GetDisplayForId(display_id).size().ToString());
 
-  display_manager()->SetDisplayUIScale(display_id, 0.5f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 0.5f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveDeviceScaleFactor());
   EXPECT_EQ(0.5f, GetDisplayInfoAt(0).GetEffectiveUIScale());
   EXPECT_EQ("960x540", GetDisplayForId(display_id).size().ToString());
 
-  display_manager()->SetDisplayUIScale(display_id, 1.25f);
+  test::DisplayManagerTestApi(display_manager())
+      .SetDisplayUIScale(display_id, 1.25f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveDeviceScaleFactor());
   EXPECT_EQ(1.25f, GetDisplayInfoAt(0).GetEffectiveUIScale());
   EXPECT_EQ("2400x1350", GetDisplayForId(display_id).size().ToString());
 }
 #endif  // defined(OS_CHROMEOS)
 
 // TODO(msw): Broken on Windows. http://crbug.com/584038
 #if defined(OS_CHROMEOS)
 TEST_P(DisplayManagerTest, FHD125DefaultsTo08UIScaling) {
   int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
@@ skipping 806 matching lines @@
   display_info_list.clear();
   display_info_list.push_back(external_display_info);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
   EXPECT_EQ(1U, display_manager()->active_display_list().size());
 
   EXPECT_TRUE(display_manager()->IsActiveDisplayId(external_id));
   EXPECT_FALSE(display_manager()->IsActiveDisplayId(internal_id));
 
   EXPECT_FALSE(display_manager()->ZoomInternalDisplay(true));
   EXPECT_FALSE(display_manager()->ZoomInternalDisplay(false));
-  EXPECT_FALSE(display_manager()->SetDisplayUIScale(internal_id, 1.0f));
+  EXPECT_FALSE(test::DisplayManagerTestApi(display_manager())
+                   .SetDisplayUIScale(internal_id, 1.0f));
 }
 
 // Make sure that bad layout information is ignored and does not crash.
 TEST_P(DisplayManagerTest, DontRegisterBadConfig) {
   if (!SupportsMultipleDisplays())
     return;
   display::DisplayIdList list = ash::test::CreateDisplayIdList2(1, 2);
   display::DisplayLayoutBuilder builder(1);
   builder.AddDisplayPlacement(2, 1, display::DisplayPlacement::LEFT, 0);
   builder.AddDisplayPlacement(3, 1, display::DisplayPlacement::BOTTOM, 0);
@@ skipping 96 matching lines @@
 }
 
 TEST_F(DisplayManagerFontTest, TextSubpixelPositioningWithDsf200Internal) {
   FontTestHelper helper(2.0f, FontTestHelper::INTERNAL);
   ASSERT_DOUBLE_EQ(
       2.0f,
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_TRUE(IsTextSubpixelPositioningEnabled());
   EXPECT_EQ(gfx::FontRenderParams::HINTING_NONE, GetFontHintingParams());
 
-  helper.display_manager()->SetDisplayUIScale(
-      display::Screen::GetScreen()->GetPrimaryDisplay().id(), 2.0f);
+  test::DisplayManagerTestApi(helper.display_manager())
+      .SetDisplayUIScale(display::Screen::GetScreen()->GetPrimaryDisplay().id(),
+                         2.0f);
 
   ASSERT_DOUBLE_EQ(
       1.0f,
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_FALSE(IsTextSubpixelPositioningEnabled());
   EXPECT_NE(gfx::FontRenderParams::HINTING_NONE, GetFontHintingParams());
 }
 
 TEST_F(DisplayManagerFontTest, TextSubpixelPositioningWithDsf100External) {
   FontTestHelper helper(1.0f, FontTestHelper::EXTERNAL);
@@ skipping 24 matching lines @@
 
 TEST_F(DisplayManagerFontTest,
        TextSubpixelPositioningWithDsf125InternalWithScaling) {
   FontTestHelper helper(1.25f, FontTestHelper::INTERNAL);
   ASSERT_DOUBLE_EQ(
       1.0f,
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_FALSE(IsTextSubpixelPositioningEnabled());
   EXPECT_NE(gfx::FontRenderParams::HINTING_NONE, GetFontHintingParams());
 
-  helper.display_manager()->SetDisplayUIScale(
-      display::Screen::GetScreen()->GetPrimaryDisplay().id(), 0.8f);
+  test::DisplayManagerTestApi(helper.display_manager())
+      .SetDisplayUIScale(display::Screen::GetScreen()->GetPrimaryDisplay().id(),
+                         0.8f);
 
   ASSERT_DOUBLE_EQ(
       1.25f,
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_TRUE(IsTextSubpixelPositioningEnabled());
   EXPECT_EQ(gfx::FontRenderParams::HINTING_NONE, GetFontHintingParams());
 }
 
 TEST_P(DisplayManagerTest, CheckInitializationOfRotationProperty) {
   int64_t id = display_manager()->GetDisplayAt(0).id();
@@ skipping 49 matching lines @@
   const display::DisplayLayout& stored =
       layout_store->GetRegisteredDisplayLayout(list);
 
   EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);
   EXPECT_EQ(id2, stored.placement_list[0].display_id);
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash