aura: Remove WindowTreeHost::QueryMouseLocation().

ui/aura/test/ui_controls_factory_aurax11.cc

 // Copyright 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 <X11/keysym.h>
 #include <X11/Xlib.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
+#include "ui/aura/test/aura_test_utils.h"
 #include "ui/aura/test/ui_controls_factory_aura.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/test/ui_controls_aura.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/events/test/platform_event_waiter.h"
 
 namespace aura {
@@ skipping 81 matching lines @@
       long screen_y,
       const base::Closure& closure) OVERRIDE {
     gfx::Point root_location(screen_x, screen_y);
     aura::client::ScreenPositionClient* screen_position_client =
         aura::client::GetScreenPositionClient(host_->window());
     if (screen_position_client) {
       screen_position_client->ConvertPointFromScreen(host_->window(),
                                                      &root_location);
     }
     gfx::Point root_current_location;
-    host_->QueryMouseLocation(&root_current_location);
+    WindowTreeHostTestApi host_test_api(host_);

[sky, 2014/04/25 22:46:19]

How about a static function that does all this? It can be on
WindowTreeHostTestApi if you want, or a standalone function. I'm fine with
either.

[sadrul, 2014/04/26 01:34:58]

Done. (moved WindowTreeHostTestApi into the cc file (and into aura::test
namespace), and added a static
aura::test::QueryLatestMousePositionRequestInHost()

+    root_current_location =
+        host_test_api.last_cursor_request_position_in_host();
     host_->ConvertPointFromHost(&root_current_location);
 
     if (root_location != root_current_location && button_down_mask == 0) {
       // Move the cursor because EnterNotify/LeaveNotify are generated with the
       // current mouse position as a result of XGrabPointer()
       host_->window()->MoveCursorTo(root_location);
     } else {
       XEvent xevent = {0};
       XMotionEvent* xmotion = &xevent.xmotion;
       xmotion->type = MotionNotify;
@@ skipping 98 matching lines @@
 };
 
 }  // namespace
 
 UIControlsAura* CreateUIControlsAura(WindowTreeHost* host) {
   return new UIControlsX11(host);
 }
 
 }  // namespace test
 }  // namespace aura