aura: Remove WindowTreeHost::PostNativeEvent().

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/test/x11_event_sender.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 {
 namespace test {
@@ skipping 48 matching lines @@
       SetKeycodeAndSendThenMask(&xevent, XK_Control_L, ControlMask);
     if (shift)
       SetKeycodeAndSendThenMask(&xevent, XK_Shift_L, ShiftMask);
     if (alt)
       SetKeycodeAndSendThenMask(&xevent, XK_Alt_L, Mod1Mask);
     if (command)
       SetKeycodeAndSendThenMask(&xevent, XK_Meta_L, Mod4Mask);
     xevent.xkey.keycode =
         XKeysymToKeycode(gfx::GetXDisplay(),
                          ui::XKeysymForWindowsKeyCode(key, shift));
-    host_->PostNativeEvent(&xevent);
+    PostEventToWindowTreeHost(xevent, host_);
 
     // Send key release events.
     xevent.xkey.type = KeyRelease;
-    host_->PostNativeEvent(&xevent);
+    PostEventToWindowTreeHost(xevent, host_);
     if (alt)
       UnmaskAndSetKeycodeThenSend(&xevent, Mod1Mask, XK_Alt_L);
     if (shift)
       UnmaskAndSetKeycodeThenSend(&xevent, ShiftMask, XK_Shift_L);
     if (control)
       UnmaskAndSetKeycodeThenSend(&xevent, ControlMask, XK_Control_L);
     if (command)
       UnmaskAndSetKeycodeThenSend(&xevent, Mod4Mask, XK_Meta_L);
     DCHECK(!xevent.xkey.state);
     RunClosureAfterAllPendingUIEvents(closure);
@@ skipping 23 matching lines @@
       host_->window()->MoveCursorTo(root_location);
     } else {
       XEvent xevent = {0};
       XMotionEvent* xmotion = &xevent.xmotion;
       xmotion->type = MotionNotify;
       xmotion->x = root_location.x();
       xmotion->y = root_location.y();
       xmotion->state = button_down_mask;
       xmotion->same_screen = True;
       // WindowTreeHost will take care of other necessary fields.
-      host_->PostNativeEvent(&xevent);
+      PostEventToWindowTreeHost(xevent, host_);
     }
     RunClosureAfterAllPendingUIEvents(closure);
     return true;
   }
   bool SendMouseEvents(MouseButton type, int state) override {
     return SendMouseEventsNotifyWhenDone(type, state, base::Closure());
   }
   bool SendMouseEventsNotifyWhenDone(MouseButton type,
                                      int state,
                                      const base::Closure& closure) override {
@@ skipping 19 matching lines @@
         xbutton->state = Button2Mask;
         break;
       case RIGHT:
         xbutton->button = Button3;
         xbutton->state = Button3Mask;
         break;
     }
     // WindowEventDispatcher will take care of other necessary fields.
     if (state & DOWN) {
       xevent.xbutton.type = ButtonPress;
-      host_->PostNativeEvent(&xevent);
+      PostEventToWindowTreeHost(xevent, host_);
       button_down_mask |= xbutton->state;
     }
     if (state & UP) {
       xevent.xbutton.type = ButtonRelease;
-      host_->PostNativeEvent(&xevent);
+      PostEventToWindowTreeHost(xevent, host_);
       button_down_mask = (button_down_mask | xbutton->state) ^ xbutton->state;
     }
     RunClosureAfterAllPendingUIEvents(closure);
     return true;
   }
   bool SendMouseClick(MouseButton type) override {
     return SendMouseEvents(type, UP | DOWN);
   }
   void RunClosureAfterAllPendingUIEvents(
       const base::Closure& closure) override {
     if (closure.is_null())
       return;
     static XEvent* marker_event = NULL;
     if (!marker_event) {
       marker_event = new XEvent();
       marker_event->xclient.type = ClientMessage;
       marker_event->xclient.display = NULL;
       marker_event->xclient.window = None;
       marker_event->xclient.format = 8;
     }
     marker_event->xclient.message_type = MarkerEventAtom();
-    host_->PostNativeEvent(marker_event);
+    PostEventToWindowTreeHost(*marker_event, host_);
     ui::PlatformEventWaiter::Create(closure, base::Bind(&Matcher));
   }
  private:
   void SetKeycodeAndSendThenMask(XEvent* xevent,
                                  KeySym keysym,
                                  unsigned int mask) {
     xevent->xkey.keycode =
         XKeysymToKeycode(gfx::GetXDisplay(), keysym);
-    host_->PostNativeEvent(xevent);
+    PostEventToWindowTreeHost(*xevent, host_);
     xevent->xkey.state |= mask;
   }
 
   void UnmaskAndSetKeycodeThenSend(XEvent* xevent,
                                    unsigned int mask,
                                    KeySym keysym) {
     xevent->xkey.state ^= mask;
     xevent->xkey.keycode =
         XKeysymToKeycode(gfx::GetXDisplay(), keysym);
-    host_->PostNativeEvent(xevent);
+    PostEventToWindowTreeHost(*xevent, host_);
   }
 
   WindowTreeHost* host_;
 
   DISALLOW_COPY_AND_ASSIGN(UIControlsX11);
 };
 
 }  // namespace
 
 UIControlsAura* CreateUIControlsAura(WindowTreeHost* host) {
   return new UIControlsX11(host);
 }
 
 }  // namespace test
 }  // namespace aura