Index: ash/magnifier/magnification_controller_unittest.cc |
diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc |
index 4b37e32e7fc22e643c8ce9e148739904bc601861..dbf5891fe8c391d1ab0c5fa89c8a071f18e95cc5 100644 |
--- a/ash/magnifier/magnification_controller_unittest.cc |
+++ b/ash/magnifier/magnification_controller_unittest.cc |
@@ -459,7 +459,7 @@ TEST_F(MagnificationControllerTest, PanWindowToRight) { |
GetMagnificationController()->SetEnabled(true); |
EXPECT_FLOAT_EQ(2.f, GetMagnificationController()->GetScale()); |
- scale *= ui::kMagnificationScaleFactor; |
+ scale *= kMagnificationScaleFactor; |
GetMagnificationController()->SetScale(scale, false); |
EXPECT_FLOAT_EQ(2.3784142, GetMagnificationController()->GetScale()); |
GetEventGenerator().MoveMouseToInHost(gfx::Point(400, 300)); |
@@ -468,21 +468,21 @@ TEST_F(MagnificationControllerTest, PanWindowToRight) { |
EXPECT_EQ("566,299", env->last_mouse_location().ToString()); |
EXPECT_EQ("705,300", GetHostMouseLocation()); |
- scale *= ui::kMagnificationScaleFactor; |
+ scale *= kMagnificationScaleFactor; |
GetMagnificationController()->SetScale(scale, false); |
EXPECT_FLOAT_EQ(2.8284268, GetMagnificationController()->GetScale()); |
GetEventGenerator().MoveMouseToInHost(gfx::Point(799, 300)); |
EXPECT_EQ("599,299", env->last_mouse_location().ToString()); |
EXPECT_EQ("702,300", GetHostMouseLocation()); |
- scale *= ui::kMagnificationScaleFactor; |
+ scale *= kMagnificationScaleFactor; |
GetMagnificationController()->SetScale(scale, false); |
EXPECT_FLOAT_EQ(3.3635852, GetMagnificationController()->GetScale()); |
GetEventGenerator().MoveMouseToInHost(gfx::Point(799, 300)); |
EXPECT_EQ("627,298", env->last_mouse_location().ToString()); |
EXPECT_EQ("707,300", GetHostMouseLocation()); |
- scale *= ui::kMagnificationScaleFactor; |
+ scale *= kMagnificationScaleFactor; |
GetMagnificationController()->SetScale(scale, false); |
EXPECT_FLOAT_EQ(4.f, GetMagnificationController()->GetScale()); |
GetEventGenerator().MoveMouseToInHost(gfx::Point(799, 300)); |
@@ -504,7 +504,7 @@ TEST_F(MagnificationControllerTest, PanWindowToLeft) { |
GetMagnificationController()->SetEnabled(true); |
EXPECT_FLOAT_EQ(2.f, GetMagnificationController()->GetScale()); |
- scale *= ui::kMagnificationScaleFactor; |
+ scale *= kMagnificationScaleFactor; |
GetMagnificationController()->SetScale(scale, false); |
EXPECT_FLOAT_EQ(2.3784142, GetMagnificationController()->GetScale()); |
GetEventGenerator().MoveMouseToInHost(gfx::Point(400, 300)); |
@@ -513,21 +513,21 @@ TEST_F(MagnificationControllerTest, PanWindowToLeft) { |
EXPECT_EQ("231,299", env->last_mouse_location().ToString()); |
EXPECT_EQ("100,300", GetHostMouseLocation()); |
- scale *= ui::kMagnificationScaleFactor; |
+ scale *= kMagnificationScaleFactor; |
GetMagnificationController()->SetScale(scale, false); |
EXPECT_FLOAT_EQ(2.8284268, GetMagnificationController()->GetScale()); |
GetEventGenerator().MoveMouseToInHost(gfx::Point(0, 300)); |
EXPECT_EQ("194,299", env->last_mouse_location().ToString()); |
EXPECT_EQ("99,300", GetHostMouseLocation()); |
- scale *= ui::kMagnificationScaleFactor; |
+ scale *= kMagnificationScaleFactor; |
GetMagnificationController()->SetScale(scale, false); |
EXPECT_FLOAT_EQ(3.3635852, GetMagnificationController()->GetScale()); |
GetEventGenerator().MoveMouseToInHost(gfx::Point(0, 300)); |
EXPECT_EQ("164,298", env->last_mouse_location().ToString()); |
EXPECT_EQ("98,300", GetHostMouseLocation()); |
- scale *= ui::kMagnificationScaleFactor; |
+ scale *= kMagnificationScaleFactor; |
GetMagnificationController()->SetScale(scale, false); |
EXPECT_FLOAT_EQ(4.f, GetMagnificationController()->GetScale()); |
GetEventGenerator().MoveMouseToInHost(gfx::Point(0, 300)); |