Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again.

ui/views/test/ui_controls_factory_desktop_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>
 
 // X macro fail.
 #if defined(RootWindow)
 #undef RootWindow
@@ skipping 122 matching lines @@
       SetKeycodeAndSendThenMask(dispatcher, &xevent, XK_Control_L,
                                 ControlMask);
     }
     if (shift)
       SetKeycodeAndSendThenMask(dispatcher, &xevent, XK_Shift_L, ShiftMask);
     if (alt)
       SetKeycodeAndSendThenMask(dispatcher, &xevent, XK_Alt_L, Mod1Mask);
     xevent.xkey.keycode =
         XKeysymToKeycode(x_display_,
                          ui::XKeysymForWindowsKeyCode(key, shift));
-    dispatcher->PostNativeEvent(&xevent);
+    dispatcher->host()->PostNativeEvent(&xevent);
 
     // Send key release events.
     xevent.xkey.type = KeyRelease;
-    dispatcher->PostNativeEvent(&xevent);
+    dispatcher->host()->PostNativeEvent(&xevent);
     if (alt)
       UnmaskAndSetKeycodeThenSend(dispatcher, &xevent, Mod1Mask, XK_Alt_L);
     if (shift)
       UnmaskAndSetKeycodeThenSend(dispatcher, &xevent, ShiftMask, XK_Shift_L);
     if (control) {
       UnmaskAndSetKeycodeThenSend(dispatcher, &xevent, ControlMask,
                                   XK_Control_L);
     }
     DCHECK(!xevent.xkey.state);
     RunClosureAfterAllPendingUIEvents(closure);
@@ skipping 20 matching lines @@
     }
 
     XEvent xevent = {0};
     XMotionEvent* xmotion = &xevent.xmotion;
     xmotion->type = MotionNotify;
     xmotion->x = window_point.x();
     xmotion->y = window_point.y();
     xmotion->state = button_down_mask;
     xmotion->same_screen = True;
     // RootWindow will take care of other necessary fields.
-    root_window->GetDispatcher()->PostNativeEvent(&xevent);
+    root_window->GetDispatcher()->host()->PostNativeEvent(&xevent);
     RunClosureAfterAllPendingUIEvents(closure);
     return true;
   }
   virtual bool SendMouseEvents(MouseButton type, int state) OVERRIDE {
     return SendMouseEventsNotifyWhenDone(type, state, base::Closure());
   }
   virtual bool SendMouseEventsNotifyWhenDone(
       MouseButton type,
       int state,
       const base::Closure& closure) OVERRIDE {
@@ skipping 18 matching lines @@
         xbutton->state = Button2Mask;
         break;
       case RIGHT:
         xbutton->button = Button3;
         xbutton->state = Button3Mask;
         break;
     }
     // RootWindow will take care of other necessary fields.
     if (state & DOWN) {
       xevent.xbutton.type = ButtonPress;
-      root_window->GetDispatcher()->PostNativeEvent(&xevent);
+      root_window->GetDispatcher()->host()->PostNativeEvent(&xevent);
       button_down_mask |= xbutton->state;
     }
     if (state & UP) {
       xevent.xbutton.type = ButtonRelease;
-      root_window->GetDispatcher()->PostNativeEvent(&xevent);
+      root_window->GetDispatcher()->host()->PostNativeEvent(&xevent);
       button_down_mask = (button_down_mask | xbutton->state) ^ xbutton->state;
     }
     RunClosureAfterAllPendingUIEvents(closure);
     return true;
   }
   virtual bool SendMouseClick(MouseButton type) OVERRIDE {
     return SendMouseEvents(type, UP | DOWN);
   }
   virtual void RunClosureAfterAllPendingUIEvents(
       const base::Closure& closure) OVERRIDE {
@@ skipping 30 matching lines @@
     NOTREACHED() << "Coulding find RW for " << point.ToString() << " among "
                  << windows.size() << " RWs.";
     return NULL;
   }
 
   void SetKeycodeAndSendThenMask(aura::RootWindow* root_window,
                                  XEvent* xevent,
                                  KeySym keysym,
                                  unsigned int mask) {
     xevent->xkey.keycode = XKeysymToKeycode(x_display_, keysym);
-    root_window->PostNativeEvent(xevent);
+    root_window->host()->PostNativeEvent(xevent);
     xevent->xkey.state |= mask;
   }
 
   void UnmaskAndSetKeycodeThenSend(aura::RootWindow* root_window,
                                    XEvent* xevent,
                                    unsigned int mask,
                                    KeySym keysym) {
     xevent->xkey.state ^= mask;
     xevent->xkey.keycode = XKeysymToKeycode(x_display_, keysym);
-    root_window->PostNativeEvent(xevent);
+    root_window->host()->PostNativeEvent(xevent);
   }
 
   // Our X11 state.
   Display* x_display_;
   ::Window x_root_window_;
 
   // Input-only window used for events.
   ::Window x_window_;
 
   DISALLOW_COPY_AND_ASSIGN(UIControlsDesktopX11);
 };
 
 }  // namespace
 
 UIControlsAura* CreateUIControlsDesktopAura() {
   return new UIControlsDesktopX11();
 }
 
 }  // namespace test
 }  // namespace views