Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / magnifier / magnification_controller_unittest.cc

diff --git a/src/ash/magnifier/magnification_controller_unittest.cc b/src/ash/magnifier/magnification_controller_unittest.cc
index 5ad2d12..54daf88 100644 (file)
--- a/src/ash/magnifier/magnification_controller_unittest.cc
+++ b/src/ash/magnifier/magnification_controller_unittest.cc
@@ -10,13 +10,13 @@
 #include "base/strings/stringprintf.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
+#include "ui/aura/test/aura_test_utils.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
-namespace internal {
 namespace {
 
 const int kRootHeight = 600;
@@ -54,9 +54,10 @@ class MagnificationControllerTest: public test::AshTestBase {
   }
 
   std::string GetHostMouseLocation() {
-    gfx::Point point;
-    GetRootWindow()->GetHost()->QueryMouseLocation(&point);
-    return point.ToString();
+    const gfx::Point& location =
+        aura::test::QueryLatestMousePositionRequestInHost(
+            GetRootWindow()->GetHost());
+    return location.ToString();
   }
 
   ash::MagnificationController* GetMagnificationController() const {
@@ -439,5 +440,4 @@ TEST_F(MagnificationControllerTest, PanWindowToLeft) {
   EXPECT_EQ("100,300", GetHostMouseLocation());
 }
 
-}  // namespace internal
 }  // namespace ash