Make GetRootWindow() return a Window instead of a RootWindow.

ash/wm/caption_buttons/frame_maximize_button_unittest.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 "ash/wm/caption_buttons/frame_maximize_button.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
@@ skipping 517 matching lines @@
   // Move the mouse cursor over the button to bring up the maximizer bubble.
   generator.MoveMouseTo(button_pos);
   EXPECT_TRUE(maximize_button->maximizer());
 
   // Check that the focused window is still the same.
   EXPECT_EQ(active, aura::client::GetFocusClient(window)->GetFocusedWindow());
 }
 
 TEST_F(FrameMaximizeButtonTest, MaximizeTap) {
   aura::Window* window = widget()->GetNativeWindow();
-  aura::RootWindow* root_window = window->GetRootWindow();
+  aura::Window* root_window = window->GetRootWindow();
   ash::FrameMaximizeButton* maximize_button =
       FrameMaximizeButtonTest::maximize_button();
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
 
   const int touch_default_radius =
       ui::GestureConfiguration::default_radius();
   ui::GestureConfiguration::set_default_radius(0);
 
+  aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
   const int kTouchId = 2;
   ui::TouchEvent press(ui::ET_TOUCH_PRESSED,
                        button_pos,
                        kTouchId,
                        ui::EventTimeForNow());
-  root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
+  dispatcher->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
 
   button_pos.Offset(9, 8);
   ui::TouchEvent release(
       ui::ET_TOUCH_RELEASED,
       button_pos,
       kTouchId,
       press.time_stamp() + base::TimeDelta::FromMilliseconds(50));
-  root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);
+  dispatcher->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);
 
   ui::GestureConfiguration::set_default_radius(touch_default_radius);
 }
 
 // Test that only the left button will activate the maximize button.
 TEST_F(FrameMaximizeButtonTest, OnlyLeftButtonMaximizes) {
   aura::Window* window = widget()->GetNativeWindow();
   ash::FrameMaximizeButton* maximize_button =
       FrameMaximizeButtonTest::maximize_button();
   maximize_button->set_bubble_appearance_delay_ms(0);
@@ skipping 289 matching lines @@
 
   // Test that we have properly reset the state of the now inactive window.
   EXPECT_FALSE(maximize_button->maximizer());
   EXPECT_FALSE(maximize_button->phantom_window_open());
   EXPECT_TRUE(wm::GetWindowState(window)->IsNormalShowState());
   EXPECT_EQ(initial_bounds.ToString(), window->GetBoundsInScreen().ToString());
 }
 
 }  // namespace test
 }  // namespace ash