mash: make Env::last_mouse_location() accurate for Mus

ash/magnifier/magnification_controller_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/magnifier/magnification_controller.h"
 
 #include "ash/common/accessibility_types.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/strings/stringprintf.h"
@@ skipping 261 matching lines @@
       false, gfx::Rect(790, 590, 10, 10));
   EXPECT_EQ("400,300 400x300", GetViewport().ToString());
 
   // Don't follow focus onto empty rectangle.
   GetMagnificationController()->HandleFocusedNodeChanged(false,
                                                          gfx::Rect(0, 0, 0, 0));
   EXPECT_EQ("400,300 400x300", GetViewport().ToString());
 }
 
 TEST_F(MagnificationControllerTest, PanWindow2xLeftToRight) {
-  const aura::Env* env = aura::Env::GetInstance();
+  aura::Env* env = aura::Env::GetInstance();
 
   GetEventGenerator().MoveMouseToInHost(gfx::Point(0, 0));
   EXPECT_EQ(1.f, GetMagnificationController()->GetScale());
   EXPECT_EQ("0,0 800x600", GetViewport().ToString());
   EXPECT_EQ("0,0", env->last_mouse_location().ToString());
 
   // Enables magnifier and confirm the viewport is at center.
   GetMagnificationController()->SetEnabled(true);
   EXPECT_EQ(2.0f, GetMagnificationController()->GetScale());
 
@@ skipping 82 matching lines @@
   GetEventGenerator().MoveMouseToInHost(gfx::Point(780, 150));
   EXPECT_EQ("780,75", env->last_mouse_location().ToString());
   EXPECT_EQ("400,0 400x300", GetViewport().ToString());
 
   GetEventGenerator().MoveMouseToInHost(gfx::Point(799, 150));
   EXPECT_EQ("799,75", env->last_mouse_location().ToString());
   EXPECT_EQ("400,0 400x300", GetViewport().ToString());
 }
 
 TEST_F(MagnificationControllerTest, PanWindow2xRightToLeft) {
-  const aura::Env* env = aura::Env::GetInstance();
+  aura::Env* env = aura::Env::GetInstance();
 
   GetEventGenerator().MoveMouseToInHost(gfx::Point(799, 300));
   EXPECT_EQ(1.f, GetMagnificationController()->GetScale());
   EXPECT_EQ("0,0 800x600", GetViewport().ToString());
   EXPECT_EQ("799,300", env->last_mouse_location().ToString());
 
   // Enables magnifier and confirm the viewport is at center.
   GetMagnificationController()->SetEnabled(true);
 
   GetEventGenerator().MoveMouseToInHost(gfx::Point(799, 300));
@@ skipping 31 matching lines @@
   GetEventGenerator().MoveMouseToInHost(gfx::Point(0, 300));
   EXPECT_EQ("50,300", env->last_mouse_location().ToString());
   EXPECT_EQ("0,150 400x300", GetViewport().ToString());
 
   GetEventGenerator().MoveMouseToInHost(gfx::Point(0, 300));
   EXPECT_EQ("0,300", env->last_mouse_location().ToString());
   EXPECT_EQ("0,150 400x300", GetViewport().ToString());
 }
 
 TEST_F(MagnificationControllerTest, PanWindowToRight) {
-  const aura::Env* env = aura::Env::GetInstance();
+  aura::Env* env = aura::Env::GetInstance();
 
   GetEventGenerator().MoveMouseToInHost(gfx::Point(400, 300));
   EXPECT_EQ(1.f, GetMagnificationController()->GetScale());
   EXPECT_EQ("0,0 800x600", GetViewport().ToString());
   EXPECT_EQ("400,300", env->last_mouse_location().ToString());
 
   float scale = 2.f;
 
   // Enables magnifier and confirm the viewport is at center.
   GetMagnificationController()->SetEnabled(true);
@@ skipping 24 matching lines @@
 
   scale *= kMagnificationScaleFactor;
   GetMagnificationController()->SetScale(scale, false);
   EXPECT_FLOAT_EQ(4.f, GetMagnificationController()->GetScale());
   GetEventGenerator().MoveMouseToInHost(gfx::Point(799, 300));
   EXPECT_EQ("649,298", env->last_mouse_location().ToString());
   EXPECT_EQ("704,300", GetHostMouseLocation());
 }
 
 TEST_F(MagnificationControllerTest, PanWindowToLeft) {
-  const aura::Env* env = aura::Env::GetInstance();
+  aura::Env* env = aura::Env::GetInstance();
 
   GetEventGenerator().MoveMouseToInHost(gfx::Point(400, 300));
   EXPECT_EQ(1.f, GetMagnificationController()->GetScale());
   EXPECT_EQ("0,0 800x600", GetViewport().ToString());
   EXPECT_EQ("400,300", env->last_mouse_location().ToString());
 
   float scale = 2.f;
 
   // Enables magnifier and confirm the viewport is at center.
   GetMagnificationController()->SetEnabled(true);
@@ skipping 202 matching lines @@
   UpdateDisplay("500x500");
   EXPECT_EQ("0,0 500x500", screen->GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ(2.0f, GetMagnificationController()->GetScale());
 
   GetMagnificationController()->SetEnabled(false);
   EXPECT_EQ("0,0 500x500", screen->GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ(1.0f, GetMagnificationController()->GetScale());
 }
 
 }  // namespace ash