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

ash/dip_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 <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/launcher/launcher.h"
@@ skipping 17 matching lines @@
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 typedef ash::test::AshTestBase DIPTest;
 
 // Test if the WM sets correct work area under different density.
 TEST_F(DIPTest, WorkArea) {
   UpdateDisplay("1000x900*1.0f");
 
-  aura::RootWindow* root = Shell::GetPrimaryRootWindow();
+  aura::Window* root = Shell::GetPrimaryRootWindow();
   const gfx::Display display =
       Shell::GetScreen()->GetDisplayNearestWindow(root);
 
   EXPECT_EQ("0,0 1000x900", display.bounds().ToString());
   gfx::Rect work_area = display.work_area();
   EXPECT_EQ("0,0 1000x853", work_area.ToString());
   EXPECT_EQ("0,0,47,0", display.bounds().InsetsFrom(work_area).ToString());
 
   UpdateDisplay("2000x1800*2.0f");
   gfx::Screen* screen = Shell::GetScreen();
@@ skipping 18 matching lines @@
   EXPECT_EQ(
       display_2x.bounds().InsetsFrom(work_area).height(),
       launcher->shelf_widget()->GetNativeView()->layer()->bounds().height());
 }
 
 TEST_F(DIPTest, WorkAreaForLegacyShelfLayout) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       ash::switches::kAshDisableAlternateShelfLayout);
   UpdateDisplay("1000x900*1.0f");
 
-  aura::RootWindow* root = Shell::GetPrimaryRootWindow();
+  aura::Window* root = Shell::GetPrimaryRootWindow();
   const gfx::Display display =
       Shell::GetScreen()->GetDisplayNearestWindow(root);
 
   EXPECT_EQ("0,0 1000x900", display.bounds().ToString());
   gfx::Rect work_area = display.work_area();
   EXPECT_EQ("0,0 1000x852", work_area.ToString());
   EXPECT_EQ("0,0,48,0", display.bounds().InsetsFrom(work_area).ToString());
 
   UpdateDisplay("2000x1800*2.0f");
   gfx::Screen* screen = Shell::GetScreen();
@@ skipping 14 matching lines @@
 
   // Sanity check if the workarea's inset hight is same as
   // the launcher's height.
   Launcher* launcher = Launcher::ForPrimaryDisplay();
   EXPECT_EQ(
       display_2x.bounds().InsetsFrom(work_area).height(),
       launcher->shelf_widget()->GetNativeView()->layer()->bounds().height());
 }
 
 }  // namespace ash