Updating device scale factor thresholds

ui/display/manager/chromeos/display_change_observer_unittest.cc

 // Copyright 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 "ui/display/manager/chromeos/display_change_observer.h"
 
 #include <string>
 
 #include "base/memory/ptr_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 312 matching lines @@
 
 TEST(DisplayChangeObserverTest, FindDeviceScaleFactor) {
   EXPECT_EQ(1.0f, ComputeDeviceScaleFactor(19.5f, gfx::Rect(1600, 900)));
 
   // 21.5" 1920x1080
   EXPECT_EQ(1.0f, ComputeDeviceScaleFactor(21.5f, gfx::Rect(1920, 1080)));
 
   // 12.1" 1280x800
   EXPECT_EQ(1.0f, ComputeDeviceScaleFactor(12.1f, gfx::Rect(1280, 800)));
 
-  // 11.6" 1920x1080
-  EXPECT_EQ(1.25f, ComputeDeviceScaleFactor(11.6f, gfx::Rect(1920, 1080)));
-
   // 13.3" 1920x1080
   EXPECT_EQ(1.25f, ComputeDeviceScaleFactor(13.3f, gfx::Rect(1920, 1080)));
 
   // 14" 1920x1080
   EXPECT_EQ(1.25f, ComputeDeviceScaleFactor(14.0f, gfx::Rect(1920, 1080)));
 
+  // 11.6" 1920x1080
+  EXPECT_EQ(1.5f, ComputeDeviceScaleFactor(11.6f, gfx::Rect(1920, 1080)));
+
   // 12.85" 2560x1700
   EXPECT_EQ(2.0f, ComputeDeviceScaleFactor(12.85f, gfx::Rect(2560, 1700)));
 
+  // 12.3" 2400x1600
+  EXPECT_EQ(2.0f, ComputeDeviceScaleFactor(12.3f, gfx::Rect(2400, 1600)));
+
   // Erroneous values should still work.
   EXPECT_EQ(1.0f, DisplayChangeObserver::FindDeviceScaleFactor(-100.0f));
   EXPECT_EQ(1.0f, DisplayChangeObserver::FindDeviceScaleFactor(0.0f));
   EXPECT_EQ(2.0f, DisplayChangeObserver::FindDeviceScaleFactor(10000.0f));
 }
 
 TEST(DisplayChangeObserverTest, FindExternalDisplayNativeModeWhenOverwritten) {
   std::unique_ptr<DisplaySnapshot> display_snapshot =
       FakeDisplaySnapshot::Builder()
           .SetId(123)
@@ skipping 10 matching lines @@
   EXPECT_FALSE(display_modes[0]->native());
   EXPECT_EQ(display_modes[0]->refresh_rate(), 60);
 
   EXPECT_EQ("1920x1080", display_modes[1]->size().ToString());
   EXPECT_TRUE(display_modes[1]->is_interlaced());
   EXPECT_TRUE(display_modes[1]->native());
   EXPECT_EQ(display_modes[1]->refresh_rate(), 60);
 }
 
 }  // namespace display