Merge 199249 "Magnifier: Prevent the cursor jumping on HiDPI dis..."

ash/ash_root_window_transformer_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/ash_root_window_transformer.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/launcher/launcher.h"
@@ skipping 185 matching lines @@
   // Move the cursor to the center of the second root window.
   generator2.MoveMouseToInHost(151, 199);
 
   magnifier->SetEnabled(true);
   EXPECT_EQ("200x120", root_windows[0]->bounds().size().ToString());
   EXPECT_EQ("200x150", root_windows[1]->bounds().size().ToString());
   EXPECT_EQ("50,120 200x150",
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
   generator2.MoveMouseToInHost(172, 219);
   EXPECT_EQ("95,80", event_handler.GetLocationAndReset());
-  EXPECT_EQ("169,175",
+  EXPECT_EQ("145,200",
             aura::Env::GetInstance()->last_mouse_location().ToString());
   EXPECT_EQ(gfx::Display::ROTATE_90, GetStoredRotation(display1.id()));
   EXPECT_EQ(gfx::Display::ROTATE_270, GetStoredRotation(display2_id));
   magnifier->SetEnabled(false);
 
   display_manager->SetDisplayRotation(display1.id(),
                                       gfx::Display::ROTATE_180);
   // Move the cursor to the center of the first root window.
   generator1.MoveMouseToInHost(59, 99);
 
@@ skipping 172 matching lines @@
   EXPECT_EQ("159,99", event_handler.GetLocationAndReset());
 
   magnifier->SetEnabled(false);
   EXPECT_FLOAT_EQ(1.0f, magnifier->GetScale());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace test
 }  // namespace ash