Add 1.6x mode.

ui/display/manager/managed_display_info.cc

Index: ui/display/manager/managed_display_info.cc
diff --git a/ui/display/manager/managed_display_info.cc b/ui/display/manager/managed_display_info.cc
index 4ed44db6437ccde50ad2be05bc8f9d02d71377ca..c1fc55471ddf35ec455e6201824b5e1e0405cf52 100644
--- a/ui/display/manager/managed_display_info.cc
+++ b/ui/display/manager/managed_display_info.cc
@@ -33,7 +33,6 @@ const int64_t kSynthesizedDisplayIdStart = 2200000000LL;
 int64_t synthesized_display_id = kSynthesizedDisplayIdStart;
 
 const float kDpi96 = 96.0;
-bool use_125_dsf_for_ui_scaling = true;
 
 // Check the content of |spec| and fill |bounds| and |device_scale_factor|.
 // Returns true when |bounds| is found.
@@ -146,8 +145,7 @@ gfx::Size ManagedDisplayMode::GetSizeInDIP(bool is_internal) const {
   size_dip.Scale(ui_scale_);
   // DSF=1.25 is special on internal display. The screen is drawn with DSF=1.25
   // but it doesn't affect the screen size computation.
-  if (use_125_dsf_for_ui_scaling && is_internal &&
-      device_scale_factor_ == 1.25f)
+  if (is_internal && device_scale_factor_ == 1.25f)
     return gfx::ToFlooredSize(size_dip);
   size_dip.Scale(1.0f / device_scale_factor_);
   return gfx::ToFlooredSize(size_dip);
@@ -294,11 +292,6 @@ ManagedDisplayInfo ManagedDisplayInfo::CreateFromSpecWithID(
   return display_info;
 }
 
-// static
-void ManagedDisplayInfo::SetUse125DSFForUIScalingForTest(bool enable) {
-  use_125_dsf_for_ui_scaling = enable;
-}
-
 ManagedDisplayInfo::ManagedDisplayInfo()
     : id_(kInvalidDisplayId),
       has_overscan_(false),
@@ -511,7 +504,7 @@ bool ManagedDisplayInfo::IsColorProfileAvailable(
 }
 
 bool ManagedDisplayInfo::Use125DSFForUIScaling() const {
-  return use_125_dsf_for_ui_scaling && Display::IsInternalDisplayId(id_);
+  return Display::IsInternalDisplayId(id_);
 }
 
 void ManagedDisplayInfo::AddInputDevice(int id) {