Folds WmRootWindowController into RootWindowController

chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc

Index: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index f47a5cca2c2734f94cf693f27accd3dd6b21bc79..133985d4ebdb6f2d49021b09a08f9db96adf9016 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -8,9 +8,9 @@
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm_lookup.h"
-#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/macros.h"
@@ -58,7 +58,7 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
   }
 
   ash::WmShelf* GetWmShelf(int64_t display_id) {
-    ash::WmRootWindowController* root_window_controller =
+    ash::RootWindowController* root_window_controller =
         ash::WmLookup::Get()->GetRootWindowControllerWithDisplayId(display_id);
     EXPECT_NE(nullptr, root_window_controller);
     return root_window_controller->GetShelf();