Rename RootWindowHost to WindowTreeHost

ui/views/widget/desktop_aura/desktop_screen_x11_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/widget/desktop_aura/desktop_screen_x11.h"
 
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/views/test/views_test_base.h"
@@ skipping 185 matching lines @@
   // The first display in the list is always the primary, even if other
   // displays are to the left in screen layout.
   EXPECT_EQ(kFirstDisplay, screen()->GetPrimaryDisplay().id());
 }
 
 TEST_F(DesktopScreenX11Test, GetWindowAtScreenPoint) {
   Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(10, 10, 10, 10));
   Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(50, 50, 10, 10));
   Widget* window_three = BuildTopLevelDesktopWidget(gfx::Rect(15, 15, 20, 20));
 
-  // Make sure the internal state of DesktopRootWindowHostX11 is set up
+  // Make sure the internal state of DesktopWindowTreeHostX11 is set up
   // correctly.
-  ASSERT_EQ(3u, DesktopRootWindowHostX11::GetAllOpenWindows().size());
+  ASSERT_EQ(3u, DesktopWindowTreeHostX11::GetAllOpenWindows().size());
 
   EXPECT_EQ(window_one->GetNativeWindow(),
             screen()->GetWindowAtScreenPoint(gfx::Point(15, 15)));
   EXPECT_EQ(window_two->GetNativeWindow(),
             screen()->GetWindowAtScreenPoint(gfx::Point(55, 55)));
   EXPECT_EQ(NULL,
             screen()->GetWindowAtScreenPoint(gfx::Point(100, 100)));
 
   // Bring the third window in front. It overlaps with the first window.
   // Hit-testing on the intersecting region should give the third window.
@@ skipping 21 matching lines @@
       screen()->GetDisplayNearestWindow(window_one->GetNativeWindow()).id());
   EXPECT_EQ(
       kSecondDisplay,
       screen()->GetDisplayNearestWindow(window_two->GetNativeWindow()).id());
 
   window_one->CloseNow();
   window_two->CloseNow();
 }
 
 }  // namespace views