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

ash/wm/ash_native_cursor_manager_unittest.cc

 // Copyright (c) 2012 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/ash_native_cursor_manager.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ash/wm/image_cursors.h"
@@ skipping 155 matching lines @@
   EXPECT_EQ(gfx::Display::ROTATE_0, test_api.GetDisplay().rotation());
 
   display.set_device_scale_factor(1.0f);
   display.set_rotation(gfx::Display::ROTATE_270);
   cursor_manager->SetDisplay(display);
   EXPECT_EQ(1.0f, test_api.GetDisplay().device_scale_factor());
   EXPECT_EQ(gfx::Display::ROTATE_270, test_api.GetDisplay().rotation());
 }
 
 TEST_F(AshNativeCursorManagerTest, DisabledQueryMouseLocation) {
-  aura::RootWindow* root_window = Shell::GetInstance()->GetPrimaryRootWindow();
+  aura::Window* root_window = Shell::GetInstance()->GetPrimaryRootWindow();
 #if defined(OS_WIN)
   if (base::win::GetVersion() < base::win::VERSION_WIN8)
     return;
   // On Windows 8 the ASH environment has two processes, the viewer process
   // which runs in Windows 8 mode and the browser process. The initialization
   // happens when the viewer process connects to the browser channel and sends
   // the initial IPC message.
   RunAllPendingInMessageLoop();
 #endif
   root_window->MoveCursorTo(gfx::Point(10, 10));
 #if defined(OS_WIN)
   // The MoveCursor operation on Windows 8 is implemented in the viewer process
   // which is notified by an IPC message to perform the MoveCursor operation.
   // We need to ensure that the IPC is delivered to the viewer process and it
   // the ACK is sent back from the viewer indicating that the operation
   // completed.
   Sleep(100);
   RunAllPendingInMessageLoop();
 #endif
+  aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
   gfx::Point mouse_location;
-  EXPECT_TRUE(root_window->QueryMouseLocationForTest(&mouse_location));
+  EXPECT_TRUE(dispatcher->QueryMouseLocationForTest(&mouse_location));
   EXPECT_EQ("10,10", mouse_location.ToString());
   Shell::GetInstance()->cursor_manager()->DisableMouseEvents();
-  EXPECT_FALSE(root_window->QueryMouseLocationForTest(&mouse_location));
+  EXPECT_FALSE(dispatcher->QueryMouseLocationForTest(&mouse_location));
   EXPECT_EQ("0,0", mouse_location.ToString());
 }
 
 }  // namespace test
 }  // namespace ash