Merge 226767 "Do not transform scroll event ordinal values"

ash/display/display_controller_unittest.cc

Index: ash/display/display_controller_unittest.cc
===================================================================
--- ash/display/display_controller_unittest.cc	(revision 228919)
+++ ash/display/display_controller_unittest.cc	(working copy)
@@ -1148,11 +1148,11 @@
                            base::TimeDelta::FromMilliseconds(100),
                            10.0, 1.0, 5, 1);
 
-  // With device scale factor = 2, ordinal_offset * 2 = offset.
+  // ordinal_offset is invariant to the device scale factor.
   EXPECT_EQ(event_handler.scroll_x_offset(),
-            event_handler.scroll_x_offset_ordinal() * 2);
+            event_handler.scroll_x_offset_ordinal());
   EXPECT_EQ(event_handler.scroll_y_offset(),
-            event_handler.scroll_y_offset_ordinal() * 2);
+            event_handler.scroll_y_offset_ordinal());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }