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

ash/root_window_controller_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/root_window_controller.h"
 
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 579 matching lines @@
   delete window1;
 
   ASSERT_FALSE(observer2.destroyed());
   delete window2;
 }
 
 typedef test::NoSessionAshTestBase NoSessionRootWindowControllerTest;
 
 // Make sure that an event handler exists for entire display area.
 TEST_F(NoSessionRootWindowControllerTest, Event) {
-  aura::RootWindow* root = Shell::GetPrimaryRootWindow();
+  aura::Window* root = Shell::GetPrimaryRootWindow();
   const gfx::Size size = root->bounds().size();
   aura::Window* event_target = root->GetEventHandlerForPoint(gfx::Point(0, 0));
   EXPECT_TRUE(event_target);
   EXPECT_EQ(event_target,
             root->GetEventHandlerForPoint(gfx::Point(0, size.height() - 1)));
   EXPECT_EQ(event_target,
             root->GetEventHandlerForPoint(gfx::Point(size.width() - 1, 0)));
   EXPECT_EQ(event_target,
             root->GetEventHandlerForPoint(gfx::Point(0, size.height() - 1)));
   EXPECT_EQ(event_target,
@@ skipping 19 matching lines @@
 // Test for http://crbug.com/297858. Virtual keyboard container should only show
 // on primary root window.
 TEST_F(VirtualKeyboardRootWindowControllerTest,
        VirtualKeyboardOnPrimaryRootWindowOnly) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("500x500,500x500");
 
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
-  aura::RootWindow* primary_root_window = Shell::GetPrimaryRootWindow();
-  aura::RootWindow* secondary_root_window =
+  aura::Window* primary_root_window = Shell::GetPrimaryRootWindow();
+  aura::Window* secondary_root_window =
       root_windows[0] == primary_root_window ?
           root_windows[1] : root_windows[0];
 
   ASSERT_TRUE(Shell::GetContainer(
       primary_root_window,
       internal::kShellWindowId_VirtualKeyboardContainer));
   ASSERT_FALSE(Shell::GetContainer(
       secondary_root_window,
       internal::kShellWindowId_VirtualKeyboardContainer));
 }
 
 // Test for http://crbug.com/263599. Virtual keyboard should be able to receive
 // events at blocked user session.
 TEST_F(VirtualKeyboardRootWindowControllerTest,
        ClickVirtualKeyboardInBlockedWindow) {
-  aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
+  aura::Window* root_window = Shell::GetPrimaryRootWindow();
   aura::Window* keyboard_container = Shell::GetContainer(root_window,
       internal::kShellWindowId_VirtualKeyboardContainer);
   ASSERT_TRUE(keyboard_container);
   keyboard_container->Show();
 
   ClickTestWindow* main_delegate = new ClickTestWindow();
   scoped_ptr<aura::Window> keyboard_window(
       main_delegate->CreateTestWindowWithParent(keyboard_container));
   keyboard_container->layout_manager()->OnWindowResized();
   keyboard_window->Show();
@@ skipping 12 matching lines @@
     EXPECT_EQ(expected_mouse_presses, main_delegate->mouse_presses());
     UnblockUserSession();
   }
 }
 
 // Test for http://crbug.com/299787. RootWindowController should delete
 // the old container since the keyboard controller creates a new window in
 // GetWindowContainer().
 TEST_F(VirtualKeyboardRootWindowControllerTest,
        DeleteOldContainerOnVirtualKeyboardInit) {
-  aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
+  aura::Window* root_window = ash::Shell::GetPrimaryRootWindow();
   aura::Window* keyboard_container = Shell::GetContainer(root_window,
       internal::kShellWindowId_VirtualKeyboardContainer);
   ASSERT_TRUE(keyboard_container);
   // Track the keyboard container window.
   aura::WindowTracker tracker;
   tracker.Add(keyboard_container);
   // Mock a login state change to reinitialize the keyboard.
   ash::Shell::GetInstance()->OnLoginStateChanged(user::LOGGED_IN_OWNER);
   // keyboard_container should no longer be present.
   EXPECT_FALSE(tracker.Contains(keyboard_container));
 }
 
 }  // namespace test
 }  // namespace ash