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

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>
 
 // X macro fail.
 #if defined(RootWindow)
 #undef RootWindow
@@ skipping 100 matching lines @@
     xevent.xkey.type = KeyPress;
     if (control)
       SetKeycodeAndSendThenMask(&xevent, XK_Control_L, ControlMask);
     if (shift)
       SetKeycodeAndSendThenMask(&xevent, XK_Shift_L, ShiftMask);
     if (alt)
       SetKeycodeAndSendThenMask(&xevent, XK_Alt_L, Mod1Mask);
     xevent.xkey.keycode =
         XKeysymToKeycode(gfx::GetXDisplay(),
                          ui::XKeysymForWindowsKeyCode(key, shift));
-    root_window_->PostNativeEvent(&xevent);
+    root_window_->host()->PostNativeEvent(&xevent);
 
     // Send key release events.
     xevent.xkey.type = KeyRelease;
-    root_window_->PostNativeEvent(&xevent);
+    root_window_->host()->PostNativeEvent(&xevent);
     if (alt)
       UnmaskAndSetKeycodeThenSend(&xevent, Mod1Mask, XK_Alt_L);
     if (shift)
       UnmaskAndSetKeycodeThenSend(&xevent, ShiftMask, XK_Shift_L);
     if (control)
       UnmaskAndSetKeycodeThenSend(&xevent, ControlMask, XK_Control_L);
     DCHECK(!xevent.xkey.state);
     RunClosureAfterAllPendingUIEvents(closure);
     return true;
   }
@@ skipping 10 matching lines @@
     XMotionEvent* xmotion = &xevent.xmotion;
     xmotion->type = MotionNotify;
     gfx::Point point = ui::ConvertPointToPixel(
         root_window_->window()->layer(),
         gfx::Point(static_cast<int>(x), static_cast<int>(y)));
     xmotion->x = point.x();
     xmotion->y = point.y();
     xmotion->state = button_down_mask;
     xmotion->same_screen = True;
     // RootWindow will take care of other necessary fields.
-    root_window_->PostNativeEvent(&xevent);
+    root_window_->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 19 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_->PostNativeEvent(&xevent);
+      root_window_->host()->PostNativeEvent(&xevent);
       button_down_mask |= xbutton->state;
     }
     if (state & UP) {
       xevent.xbutton.type = ButtonRelease;
-      root_window_->PostNativeEvent(&xevent);
+      root_window_->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 {
     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();
-    root_window_->PostNativeEvent(marker_event);
+    root_window_->host()->PostNativeEvent(marker_event);
     new EventWaiter(closure, &Matcher);
   }
  private:
   void SetKeycodeAndSendThenMask(XEvent* xevent,
                                  KeySym keysym,
                                  unsigned int mask) {
     xevent->xkey.keycode =
         XKeysymToKeycode(gfx::GetXDisplay(), keysym);
-    root_window_->PostNativeEvent(xevent);
+    root_window_->host()->PostNativeEvent(xevent);
     xevent->xkey.state |= mask;
   }
 
   void UnmaskAndSetKeycodeThenSend(XEvent* xevent,
                                    unsigned int mask,
                                    KeySym keysym) {
     xevent->xkey.state ^= mask;
     xevent->xkey.keycode =
         XKeysymToKeycode(gfx::GetXDisplay(), keysym);
-    root_window_->PostNativeEvent(xevent);
+    root_window_->host()->PostNativeEvent(xevent);
   }
 
   aura::RootWindow* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(UIControlsX11);
 };
 
 }  // namespace
 
 UIControlsAura* CreateUIControlsAura(aura::RootWindow* root_window) {
   return new UIControlsX11(root_window);
 }
 
 }  // namespace test
 }  // namespace aura