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

ui/aura/test/ui_controls_factory_aurawin.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 "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/ui_controls_factory_aura.h"
 #include "ui/aura/window.h"
@@ skipping 19 matching lines @@
   UIControlsWin() {}
 
   // UIControlsAura overrides:
   virtual bool SendKeyPress(gfx::NativeWindow native_window,
                             ui::KeyboardCode key,
                             bool control,
                             bool shift,
                             bool alt,
                             bool command) {
     DCHECK(!command);  // No command key on Aura
-    HWND window = native_window->GetDispatcher()->GetAcceleratedWidget();
+    HWND window =
+        native_window->GetDispatcher()->host()->GetAcceleratedWidget();
     return SendKeyPressImpl(
         window, key, control, shift, alt, base::Closure());
   }
   virtual bool SendKeyPressNotifyWhenDone(gfx::NativeWindow native_window,
                                           ui::KeyboardCode key,
                                           bool control,
                                           bool shift,
                                           bool alt,
                                           bool command,
                                           const base::Closure& task) {
     DCHECK(!command);  // No command key on Aura
-    HWND window = native_window->GetDispatcher()->GetAcceleratedWidget();
+    HWND window =
+        native_window->GetDispatcher()->host()->GetAcceleratedWidget();
     return SendKeyPressImpl(window, key, control, shift, alt, task);
   }
   virtual bool SendMouseMove(long x, long y) {
     gfx::Point point(x, y);
     return SendMouseMoveImpl(point.x(), point.y(), base::Closure());
   }
   virtual bool SendMouseMoveNotifyWhenDone(long x,
                                            long y,
                                            const base::Closure& task) {
     gfx::Point point(x, y);
@@ skipping 20 matching lines @@
 };
 
 }  // namespace
 
 UIControlsAura* CreateUIControlsAura(aura::RootWindow* root_window) {
   return new UIControlsWin();
 }
 
 }  // namespace test
 }  // namespace aura