Folds WmRootWindowController into RootWindowController

chrome/browser/ui/ash/launcher/launcher_context_menu_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 "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 
 #include <memory>
 
 #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"
 #include "base/memory/ptr_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_shelf_id.h"
 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"
@@ skipping 27 matching lines @@
         profile(), ash::WmShell::Get()->shelf_model()));
     controller_->Init();
   }
 
   void TearDown() override {
     controller_.reset(nullptr);
     ash::test::AshTestBase::TearDown();
   }
 
   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();
   }
 
   LauncherContextMenu* CreateLauncherContextMenu(
       ash::ShelfItemType shelf_item_type,
       ash::WmShelf* wm_shelf) {
     ash::ShelfItem item;
     item.id = 123;  // dummy id
@@ skipping 233 matching lines @@
   widget->SetFullscreen(true);
   std::unique_ptr<LauncherContextMenu> primary_menu(CreateLauncherContextMenu(
       ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(primary_id)));
   std::unique_ptr<LauncherContextMenu> secondary_menu(CreateLauncherContextMenu(
       ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(secondary_id)));
   EXPECT_FALSE(IsItemPresentInMenu(primary_menu.get(),
                                    LauncherContextMenu::MENU_AUTO_HIDE));
   EXPECT_TRUE(IsItemPresentInMenu(secondary_menu.get(),
                                   LauncherContextMenu::MENU_AUTO_HIDE));
 }