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

ui/views/corewm/tooltip_controller_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 "ui/views/corewm/tooltip_controller.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/tooltip_client.h"
 #include "ui/aura/client/window_types.h"
@@ skipping 83 matching lines @@
     helper_.reset();
     widget_.reset();
     aura::test::AuraTestBase::TearDown();
   }
 
  protected:
   aura::Window* GetWindow() {
     return widget_->GetNativeWindow();
   }
 
-  aura::RootWindow* GetRootWindow() {
+  aura::Window* GetRootWindow() {
     return GetWindow()->GetRootWindow();
   }
 
   TooltipTestView* PrepareSecondView() {
     TooltipTestView* view2 = new TooltipTestView;
     widget_->GetContentsView()->AddChildView(view2);
     view_->SetBounds(0, 0, 100, 100);
     view2->SetBounds(100, 0, 100, 100);
     return view2;
   }
@@ skipping 37 matching lines @@
   EXPECT_EQ(GetWindow(), helper_->GetTooltipWindow());
 }
 
 TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text"));
   EXPECT_EQ(string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
 
   PrepareSecondView();
   aura::Window* window = GetWindow();
-  aura::RootWindow* root_window = GetRootWindow();
+  aura::Window* root_window = GetRootWindow();
 
   // Fire tooltip timer so tooltip becomes visible.
   generator_->MoveMouseRelativeTo(window, view_->bounds().CenterPoint());
   helper_->FireTooltipTimer();
   EXPECT_TRUE(helper_->IsTooltipVisible());
   for (int i = 0; i < 49; ++i) {
     generator_->MoveMouseBy(1, 0);
     EXPECT_TRUE(helper_->IsTooltipVisible());
     EXPECT_EQ(window, root_window->GetEventHandlerForPoint(
             generator_->current_location()));
@@ skipping 176 matching lines @@
 // This test creates two top level windows and verifies that the tooltip
 // displays correctly when mouse moves are dispatched to these windows.
 // Additionally it also verifies that the tooltip is reparented to the new
 // window when mouse moves are dispatched to it.
 TEST_F(TooltipControllerTest, TooltipsInMultipleRootWindows) {
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text For RootWindow1"));
   EXPECT_EQ(string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
 
   aura::Window* window = GetWindow();
-  aura::RootWindow* root_window = GetRootWindow();
+  aura::Window* root_window = GetRootWindow();
 
   // Fire tooltip timer so tooltip becomes visible.
   generator_->MoveMouseRelativeTo(window, view_->bounds().CenterPoint());
   helper_->FireTooltipTimer();
   EXPECT_TRUE(helper_->IsTooltipVisible());
   for (int i = 0; i < 49; ++i) {
     generator_->MoveMouseBy(1, 0);
     EXPECT_TRUE(helper_->IsTooltipVisible());
     EXPECT_EQ(window, root_window->GetEventHandlerForPoint(
             generator_->current_location()));
     string16 expected_tooltip =
         ASCIIToUTF16("Tooltip Text For RootWindow1");
     EXPECT_EQ(expected_tooltip, aura::client::GetTooltipText(window));
     EXPECT_EQ(expected_tooltip, helper_->GetTooltipText());
     EXPECT_EQ(window, helper_->GetTooltipWindow());
   }
 
   views::Widget* widget2 = CreateWidget(NULL);
   widget2->SetContentsView(new View);
   TooltipTestView* view2 = new TooltipTestView;
   widget2->GetContentsView()->AddChildView(view2);
   view2->SetBoundsRect(widget2->GetContentsView()->GetLocalBounds());
   helper_.reset(new TooltipControllerTestHelper(
                     GetController(widget2)));
   generator_.reset(new aura::test::EventGenerator(
       widget2->GetNativeWindow()->GetRootWindow()));
     view2->set_tooltip_text(ASCIIToUTF16("Tooltip Text For RootWindow2"));
 
   aura::Window* window2 = widget2->GetNativeWindow();
-  aura::RootWindow* root_window2 =
+  aura::Window* root_window2 =
       widget2->GetNativeWindow()->GetRootWindow();
   // Fire tooltip timer so tooltip becomes visible.
   generator_->MoveMouseRelativeTo(window2, view2->bounds().CenterPoint());
   helper_->FireTooltipTimer();
 
   EXPECT_NE(root_window, root_window2);
   EXPECT_NE(window, window2);
 
   for (int i = 0; i < 49; ++i) {
     generator_->MoveMouseBy(1, 0);
@@ skipping 56 matching lines @@
   EXPECT_EQ(
       widget_->GetNativeWindow()->GetRootWindow()->children().back()->type(),
       aura::client::WINDOW_TYPE_TOOLTIP);
 }
 
 #endif
 
 }  // namespace test
 }  // namespace corewm
 }  // namespace views