WindowTreeHostManager::GetRootWindowForDisplayId -> WmShell::GetRoo...

ash/sticky_keys/sticky_keys_overlay_unittest.cc

Index: ash/sticky_keys/sticky_keys_overlay_unittest.cc
diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
index 8cf6781222e19effc6c7e11b5bea9f3775835af3..96eaa261aa4d001f1f450a7b4b391be4e176bd84 100644
--- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc
+++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
@@ -5,7 +5,7 @@
 #include "ash/sticky_keys/sticky_keys_overlay.h"
 
 #include "ash/common/wm_shell.h"
-#include "ash/display/window_tree_host_manager.h"
+#include "ash/common/wm_window.h"
 #include "ash/shell.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/test/ash_test_base.h"
@@ -67,18 +67,18 @@ TEST_F(StickyKeysOverlayTest, OverlayNotDestroyedAfterDisplayRemoved) {
   // The overlay should belong to the secondary root window.
   StickyKeysOverlay overlay;
   views::Widget* overlay_widget = overlay.GetWidgetForTesting();
-  WindowTreeHostManager* window_tree_host_manager =
-      Shell::GetInstance()->window_tree_host_manager();
-  EXPECT_EQ(
-      window_tree_host_manager->GetRootWindowForDisplayId(secondary_display_id),
-      overlay_widget->GetNativeWindow()->GetRootWindow());
+  EXPECT_EQ(WmShell::Get()
+                ->GetRootWindowForDisplayId(secondary_display_id)
+                ->aura_window(),
+            overlay_widget->GetNativeWindow()->GetRootWindow());
 
   // Removing the second display should move the overlay to the primary root
   // window.
   UpdateDisplay("1280x1024");
-  EXPECT_EQ(
-      window_tree_host_manager->GetRootWindowForDisplayId(primary_display_id),
-      overlay_widget->GetNativeWindow()->GetRootWindow());
+  EXPECT_EQ(WmShell::Get()
+                ->GetRootWindowForDisplayId(primary_display_id)
+                ->aura_window(),
+            overlay_widget->GetNativeWindow()->GetRootWindow());
 
   overlay.SetModifierKeyState(ui::EF_SHIFT_DOWN, STICKY_KEY_STATE_ENABLED);
   EXPECT_EQ(STICKY_KEY_STATE_ENABLED,