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

ash/touch/touch_observer_hud_unittest.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 "ash/touch/touch_observer_hud.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
@@ skipping 152 matching lines @@
   }
 
   const gfx::Display& GetInternalDisplay() {
     return GetDisplayManager()->GetDisplayForId(internal_display_id_);
   }
 
   const gfx::Display& GetExternalDisplay() {
     return GetDisplayManager()->GetDisplayForId(external_display_id_);
   }
 
-  aura::RootWindow* GetInternalRootWindow() {
+  aura::Window* GetInternalRootWindow() {
     return GetDisplayController()->GetRootWindowForDisplayId(
         internal_display_id_);
   }
 
-  aura::RootWindow* GetExternalRootWindow() {
+  aura::Window* GetExternalRootWindow() {
     return GetDisplayController()->GetRootWindowForDisplayId(
         external_display_id_);
   }
 
-  aura::RootWindow* GetPrimaryRootWindow() {
+  aura::Window* GetPrimaryRootWindow() {
     const gfx::Display& display = GetPrimaryDisplay();
     return GetDisplayController()->GetRootWindowForDisplayId(display.id());
   }
 
-  aura::RootWindow* GetSecondaryRootWindow() {
+  aura::Window* GetSecondaryRootWindow() {
     const gfx::Display& display = GetSecondaryDisplay();
     return GetDisplayController()->GetRootWindowForDisplayId(display.id());
   }
 
   internal::RootWindowController* GetInternalRootController() {
-    aura::RootWindow* root = GetInternalRootWindow();
+    aura::Window* root = GetInternalRootWindow();
     return GetRootWindowController(root);
   }
 
   internal::RootWindowController* GetExternalRootController() {
-    aura::RootWindow* root = GetExternalRootWindow();
+    aura::Window* root = GetExternalRootWindow();
     return GetRootWindowController(root);
   }
 
   internal::RootWindowController* GetPrimaryRootController() {
-    aura::RootWindow* root = GetPrimaryRootWindow();
+    aura::Window* root = GetPrimaryRootWindow();
     return GetRootWindowController(root);
   }
 
   internal::RootWindowController* GetSecondaryRootController() {
-    aura::RootWindow* root = GetSecondaryRootWindow();
+    aura::Window* root = GetSecondaryRootWindow();
     return GetRootWindowController(root);
   }
 
   internal::TouchObserverHUD* GetInternalTouchHud() {
     return GetInternalRootController()->touch_hud_debug();
   }
 
   internal::TouchObserverHUD* GetExternalTouchHud() {
     return GetExternalRootController()->touch_hud_debug();
   }
@@ skipping 190 matching lines @@
   // Add the internal display back.
   AddInternalDisplay();
 
   // Check if the display's touch HUD is set correctly.
   EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id());
   CheckInternalDisplay();
 }
 
 }  // namespace internal
 }  // namespace ash