Remember the configured device scale factor for external displays.

ash/display/display_info_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/display/display_info.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash {
 
@@ skipping 26 matching lines @@
   EXPECT_EQ(gfx::Display::ROTATE_90, info.rotation());
   // TODO(oshima): This should be rotated too. Fix this.
   EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString());
 
   info = DisplayInfo::CreateFromSpecWithID("10+20-300x400*2/l@1.5", 10);
   EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString());
   EXPECT_EQ(gfx::Display::ROTATE_270, info.rotation());
   EXPECT_EQ(1.5f, info.configured_ui_scale());
 
   info = DisplayInfo::CreateFromSpecWithID(
-      "200x200#300x200|200x200%59.9|100x100%60", 10);
+      "200x200#300x200|200x200%59.9|100x100%60|150x100*2|150x150*1.25%30", 10);
   EXPECT_EQ("0,0 200x200", info.bounds_in_native().ToString());
-  EXPECT_EQ(3u, info.display_modes().size());
+  EXPECT_EQ(5u, info.display_modes().size());
   EXPECT_EQ("300x200", info.display_modes()[0].size.ToString());
   EXPECT_EQ("200x200", info.display_modes()[1].size.ToString());
   EXPECT_EQ("100x100", info.display_modes()[2].size.ToString());
+  EXPECT_EQ("150x100", info.display_modes()[3].size.ToString());
+  EXPECT_EQ("150x150", info.display_modes()[4].size.ToString());
   EXPECT_EQ(59.9f, info.display_modes()[1].refresh_rate);
   EXPECT_EQ(60.0f, info.display_modes()[2].refresh_rate);
+  EXPECT_EQ(30.0f, info.display_modes()[4].refresh_rate);
+  EXPECT_EQ(1.0f, info.display_modes()[0].device_scale_factor);
+  EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor);
+  EXPECT_EQ(1.0f, info.display_modes()[2].device_scale_factor);
+  EXPECT_EQ(2.0f, info.display_modes()[3].device_scale_factor);
+  EXPECT_EQ(1.25f, info.display_modes()[4].device_scale_factor);
   EXPECT_TRUE(info.display_modes()[0].native);
   EXPECT_FALSE(info.display_modes()[1].native);
   EXPECT_FALSE(info.display_modes()[2].native);
+  EXPECT_FALSE(info.display_modes()[3].native);
+  EXPECT_FALSE(info.display_modes()[4].native);
 }
 
 }  // namespace ash