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

ui/views/widget/widget_interactive_uitest.cc

 // Copyright (c) 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/bind.h"
 #include "base/run_loop.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
@@ skipping 176 matching lines @@
   Widget::InitParams init_params2 =
       CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   init_params2.bounds = gfx::Rect(0, 0, 200, 200);
   init_params2.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   init_params2.native_widget = new DesktopNativeWidgetAura(&widget2);
   widget2.Init(init_params2);
   widget2.SetContentsView(contents_view2);
   widget2.Show();
   aura::Window* root_window2 = widget2.GetNativeView()->GetRootWindow();
   contents_view2->RequestFocus();
-  ::SetActiveWindow(root_window2->GetDispatcher()->GetAcceleratedWidget());
+  ::SetActiveWindow(
+      root_window2->GetDispatcher()->host()->GetAcceleratedWidget());
 
   aura::client::ActivationClient* activation_client2 =
       aura::client::GetActivationClient(root_window2);
   EXPECT_TRUE(activation_client2 != NULL);
   EXPECT_EQ(activation_client2->GetActiveWindow(), widget2.GetNativeView());
   EXPECT_EQ(activation_client1->GetActiveWindow(),
             reinterpret_cast<aura::Window*>(NULL));
 
   // Now set focus back to widget 1 and expect the active window to be its
   // window.
   contents_view1->RequestFocus();
-  ::SetActiveWindow(root_window1->GetDispatcher()->GetAcceleratedWidget());
+  ::SetActiveWindow(
+      root_window1->GetDispatcher()->host()->GetAcceleratedWidget());
   EXPECT_EQ(activation_client2->GetActiveWindow(),
             reinterpret_cast<aura::Window*>(NULL));
   EXPECT_EQ(activation_client1->GetActiveWindow(), widget1.GetNativeView());
 }
 #endif
 
 TEST_F(WidgetTest, CaptureAutoReset) {
   Widget* toplevel = CreateTopLevelFramelessPlatformWidget();
   View* container = new View;
   toplevel->SetContentsView(container);
@@ skipping 515 matching lines @@
                              ui::EF_NONE);
   widget1.GetNativeWindow()->GetDispatcher()->AsRootWindowHostDelegate()->
       OnHostMouseEvent(&mouse_event);
   EXPECT_TRUE(widget1.GetAndClearGotMouseEvent());
   EXPECT_FALSE(widget2.GetAndClearGotMouseEvent());
 }
 #endif
 
 }  // namespace test
 }  // namespace views