Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again.

ash/display/display_manager_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/display/display_manager.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 573 matching lines @@
 
   // Connect another display which will become primary.
   const DisplayInfo external_display_info =
       CreateDisplayInfo(10, gfx::Rect(1, 1, 100, 100));
   display_info_list.push_back(external_display_info);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ("1,1 100x100",
             GetDisplayInfoForId(10).bounds_in_native().ToString());
   EXPECT_EQ("100x100", ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->
-      GetHostSize().ToString());
+      host()->GetBounds().size().ToString());
 }
 
 #if defined(OS_WIN)
 // Tests that rely on the actual host size/location does not work on windows.
 #define MAYBE_EnsurePointerInDisplays DISABLED_EnsurePointerInDisplays
 #define MAYBE_EnsurePointerInDisplays_2ndOnLeft DISABLED_EnsurePointerInDisplays_2ndOnLeft
 #else
 #define MAYBE_EnsurePointerInDisplays EnsurePointerInDisplays
 #define MAYBE_EnsurePointerInDisplays_2ndOnLeft EnsurePointerInDisplays_2ndOnLeft
 #endif
@@ skipping 367 matching lines @@
   TestDisplayObserver display_observer;
   Shell::GetScreen()->AddObserver(&display_observer);
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->SetSecondDisplayMode(DisplayManager::MIRRORING);
   display_manager->UpdateDisplays();
   EXPECT_TRUE(display_observer.changed_and_reset());
   EXPECT_EQ(1U, display_manager->GetNumDisplays());
   EXPECT_EQ("0,0 300x400",
             Shell::GetScreen()->GetPrimaryDisplay().bounds().ToString());
-  EXPECT_EQ("400x500", test_api.GetRootWindow()->GetHostSize().ToString());
+  EXPECT_EQ("400x500",
+      test_api.GetRootWindow()->host()->GetBounds().size().ToString());
   EXPECT_EQ("300x400",
             test_api.GetRootWindow()->window()->bounds().size().ToString());
   EXPECT_TRUE(display_manager->IsMirrored());
 
   display_manager->SetMirrorMode(false);
   EXPECT_TRUE(display_observer.changed_and_reset());
   EXPECT_EQ(NULL, test_api.GetRootWindow());
   EXPECT_EQ(2U, display_manager->GetNumDisplays());
   EXPECT_FALSE(display_manager->IsMirrored());
 
@@ skipping 92 matching lines @@
 
 TEST_F(DisplayManagerTest, MAYBE_UpdateDisplayWithHostOrigin) {
   UpdateDisplay("100x200,300x400");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
   aura::WindowEventDispatcher* dispatcher0 = root_windows[0]->GetDispatcher();
   aura::WindowEventDispatcher* dispatcher1 = root_windows[1]->GetDispatcher();
 
-  EXPECT_EQ("1,1", dispatcher0->GetHostOrigin().ToString());
-  EXPECT_EQ("100x200", dispatcher0->GetHostSize().ToString());
+  EXPECT_EQ("1,1", dispatcher0->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("100x200", dispatcher0->host()->GetBounds().size().ToString());
   // UpdateDisplay set the origin if it's not set.
-  EXPECT_NE("1,1", dispatcher1->GetHostOrigin().ToString());
-  EXPECT_EQ("300x400", dispatcher1->GetHostSize().ToString());
+  EXPECT_NE("1,1", dispatcher1->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("300x400", dispatcher1->host()->GetBounds().size().ToString());
 
   UpdateDisplay("100x200,200+300-300x400");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
-  EXPECT_EQ("0,0", dispatcher0->GetHostOrigin().ToString());
-  EXPECT_EQ("100x200", dispatcher0->GetHostSize().ToString());
-  EXPECT_EQ("200,300", dispatcher1->GetHostOrigin().ToString());
-  EXPECT_EQ("300x400", dispatcher1->GetHostSize().ToString());
+  EXPECT_EQ("0,0", dispatcher0->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("100x200", dispatcher0->host()->GetBounds().size().ToString());
+  EXPECT_EQ("200,300", dispatcher1->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("300x400", dispatcher1->host()->GetBounds().size().ToString());
 
   UpdateDisplay("400+500-200x300,300x400");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
-  EXPECT_EQ("400,500", dispatcher0->GetHostOrigin().ToString());
-  EXPECT_EQ("200x300", dispatcher0->GetHostSize().ToString());
-  EXPECT_EQ("0,0", dispatcher1->GetHostOrigin().ToString());
-  EXPECT_EQ("300x400", dispatcher1->GetHostSize().ToString());
+  EXPECT_EQ("400,500", dispatcher0->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("200x300", dispatcher0->host()->GetBounds().size().ToString());
+  EXPECT_EQ("0,0", dispatcher1->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("300x400", dispatcher1->host()->GetBounds().size().ToString());
 
   UpdateDisplay("100+200-100x200,300+500-200x300");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
-  EXPECT_EQ("100,200", dispatcher0->GetHostOrigin().ToString());
-  EXPECT_EQ("100x200", dispatcher0->GetHostSize().ToString());
-  EXPECT_EQ("300,500", dispatcher1->GetHostOrigin().ToString());
-  EXPECT_EQ("200x300", dispatcher1->GetHostSize().ToString());
+  EXPECT_EQ("100,200", dispatcher0->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("100x200", dispatcher0->host()->GetBounds().size().ToString());
+  EXPECT_EQ("300,500", dispatcher1->host()->GetBounds().origin().ToString());
+  EXPECT_EQ("200x300", dispatcher1->host()->GetBounds().size().ToString());
 }
 
 }  // namespace internal
 }  // namespace ash