chromeos: Rename ash::WmShelf to Shelf

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/public/cpp/shelf_item.h"
 #include "ash/root_window_controller.h"
@@ skipping 61 matching lines @@
   LauncherContextMenuTest() {}
 
   void SetUp() override {
     arc_test_.SetUp(&profile_);
     session_manager_ = base::MakeUnique<session_manager::SessionManager>();
     shell_delegate_ = new ChromeLauncherTestShellDelegate(&profile_);
     ash_test_helper()->set_test_shell_delegate(shell_delegate_);
     ash::test::AshTestBase::SetUp();
   }
 
-  ash::WmShelf* GetWmShelf(int64_t display_id) {
+  ash::Shelf* GetShelf(int64_t display_id) {
     ash::RootWindowController* root_window_controller =
         ash::Shell::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::Shelf* shelf) {
     ash::ShelfItem item;
     item.id = ash::ShelfID("idmockidmockidmockidmockidmockid");
     item.type = shelf_item_type;
-    return LauncherContextMenu::Create(controller(), &item, wm_shelf);
+    return LauncherContextMenu::Create(controller(), &item, shelf);
   }
 
   LauncherContextMenu* CreateLauncherContextMenuForDesktopShell(
-      ash::WmShelf* wm_shelf) {
-    return LauncherContextMenu::Create(controller(), nullptr, wm_shelf);
+      ash::Shelf* shelf) {
+    return LauncherContextMenu::Create(controller(), nullptr, shelf);
   }
 
   // Creates app window and set optional ARC application id.
   views::Widget* CreateArcWindow(std::string& window_app_id) {
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
     views::Widget* widget = new views::Widget();
     widget->Init(params);
     widget->Show();
     widget->Activate();
     exo::ShellSurface::SetApplicationId(widget->GetNativeWindow(),
@@ skipping 18 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(LauncherContextMenuTest);
 };
 
 // Verifies that "New Incognito window" menu item in the launcher context
 // menu is disabled when Incognito mode is switched off (by a policy).
 TEST_F(LauncherContextMenuTest,
        NewIncognitoWindowMenuIsDisabledWhenIncognitoModeOff) {
   int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   // Initially, "New Incognito window" should be enabled.
   std::unique_ptr<LauncherContextMenu> menu(CreateLauncherContextMenu(
-      ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(primary_id)));
+      ash::TYPE_BROWSER_SHORTCUT, GetShelf(primary_id)));
   ASSERT_TRUE(IsItemPresentInMenu(
       menu.get(), LauncherContextMenu::MENU_NEW_INCOGNITO_WINDOW));
   EXPECT_TRUE(menu->IsCommandIdEnabled(
       LauncherContextMenu::MENU_NEW_INCOGNITO_WINDOW));
 
   // Disable Incognito mode.
   IncognitoModePrefs::SetAvailability(profile()->GetPrefs(),
                                       IncognitoModePrefs::DISABLED);
   menu.reset(CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT,
-                                       GetWmShelf(primary_id)));
+                                       GetShelf(primary_id)));
   // The item should be disabled.
   ASSERT_TRUE(IsItemPresentInMenu(
       menu.get(), LauncherContextMenu::MENU_NEW_INCOGNITO_WINDOW));
   EXPECT_FALSE(menu->IsCommandIdEnabled(
       LauncherContextMenu::MENU_NEW_INCOGNITO_WINDOW));
 }
 
 // Verifies that "New window" menu item in the launcher context
 // menu is disabled when Incognito mode is forced (by a policy).
 TEST_F(LauncherContextMenuTest,
        NewWindowMenuIsDisabledWhenIncognitoModeForced) {
   int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   // Initially, "New window" should be enabled.
   std::unique_ptr<LauncherContextMenu> menu(CreateLauncherContextMenu(
-      ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(primary_id)));
+      ash::TYPE_BROWSER_SHORTCUT, GetShelf(primary_id)));
   ASSERT_TRUE(IsItemPresentInMenu(
       menu.get(), LauncherContextMenu::MENU_NEW_WINDOW));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW));
 
   // Disable Incognito mode.
   IncognitoModePrefs::SetAvailability(profile()->GetPrefs(),
                                       IncognitoModePrefs::FORCED);
   menu.reset(CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT,
-                                       GetWmShelf(primary_id)));
+                                       GetShelf(primary_id)));
   ASSERT_TRUE(IsItemPresentInMenu(
       menu.get(), LauncherContextMenu::MENU_NEW_WINDOW));
   EXPECT_FALSE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW));
 }
 
 // Verifies status of contextmenu items for desktop shell.
 TEST_F(LauncherContextMenuTest, DesktopShellLauncherContextMenuItemCheck) {
   int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   std::unique_ptr<LauncherContextMenu> menu(
-      CreateLauncherContextMenuForDesktopShell(GetWmShelf(primary_id)));
+      CreateLauncherContextMenuForDesktopShell(GetShelf(primary_id)));
   EXPECT_FALSE(
       IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));
   EXPECT_FALSE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));
   EXPECT_TRUE(
       IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_AUTO_HIDE));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_AUTO_HIDE));
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(),
                                   LauncherContextMenu::MENU_ALIGNMENT_MENU));
   EXPECT_TRUE(
       menu->IsCommandIdEnabled(LauncherContextMenu::MENU_ALIGNMENT_MENU));
   // By default, screen is not locked and ChangeWallPaper item is added in
   // menu. ChangeWallPaper item is not enabled in default mode.
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(),
                                   LauncherContextMenu::MENU_CHANGE_WALLPAPER));
   EXPECT_FALSE(
       menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CHANGE_WALLPAPER));
 }
 
 // Verifies that "Close" is not shown in context menu if no browser window is
 // opened.
 TEST_F(LauncherContextMenuTest,
        DesktopShellLauncherContextMenuVerifyCloseItem) {
   int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   std::unique_ptr<LauncherContextMenu> menu(CreateLauncherContextMenu(
-      ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(primary_id)));
+      ash::TYPE_BROWSER_SHORTCUT, GetShelf(primary_id)));
   ASSERT_FALSE(
       IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));
 }
 
 // Verifies contextmenu items for ARC app
 TEST_F(LauncherContextMenuTest, ArcLauncherContextMenuItemCheck) {
   arc_test().app_instance()->RefreshAppList();
   arc_test().app_instance()->SendRefreshAppList(
       std::vector<arc::mojom::AppInfo>(arc_test().fake_apps().begin(),
                                        arc_test().fake_apps().begin() + 1));
   const std::string app_id = ArcAppTest::GetAppId(arc_test().fake_apps()[0]);
 
   controller()->PinAppWithID(app_id);
 
   const ash::ShelfItem* item = controller()->GetItem(ash::ShelfID(app_id));
   ASSERT_TRUE(item);
   int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
-  ash::WmShelf* wm_shelf = GetWmShelf(primary_id);
+  ash::Shelf* shelf = GetShelf(primary_id);
 
   std::unique_ptr<LauncherContextMenu> menu(
-      new ArcLauncherContextMenu(controller(), item, wm_shelf));
+      new ArcLauncherContextMenu(controller(), item, shelf));
 
   // ARC app is pinned but not running.
   EXPECT_TRUE(
       IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_OPEN_NEW));
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_PIN));
   EXPECT_FALSE(
       IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));
 
   EXPECT_TRUE(
       IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_AUTO_HIDE));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_AUTO_HIDE));
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(),
                                   LauncherContextMenu::MENU_ALIGNMENT_MENU));
   EXPECT_TRUE(
       menu->IsCommandIdEnabled(LauncherContextMenu::MENU_ALIGNMENT_MENU));
   // By default, screen is not locked and ChangeWallPaper item is added in
   // menu. ChangeWallPaper item is not enabled in default mode.
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(),
                                   LauncherContextMenu::MENU_CHANGE_WALLPAPER));
   EXPECT_FALSE(
       menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CHANGE_WALLPAPER));
 
   // ARC app is running.
   std::string window_app_id1("org.chromium.arc.1");
   CreateArcWindow(window_app_id1);
   arc_test().app_instance()->SendTaskCreated(1, arc_test().fake_apps()[0],
                                              std::string());
-  menu.reset(new ArcLauncherContextMenu(controller(), item, wm_shelf));
+  menu.reset(new ArcLauncherContextMenu(controller(), item, shelf));
 
   EXPECT_FALSE(
       IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_PIN));
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE));
 
   // ARC non-launchable app is running.
   const std::string app_id2 = ArcAppTest::GetAppId(arc_test().fake_apps()[1]);
   std::string window_app_id2("org.chromium.arc.2");
   CreateArcWindow(window_app_id2);
   arc_test().app_instance()->SendTaskCreated(2, arc_test().fake_apps()[1],
                                              std::string());
   const ash::ShelfItem* item2 = controller()->GetItem(ash::ShelfID(app_id2));
   ASSERT_TRUE(item2);
-  menu.reset(new ArcLauncherContextMenu(controller(), item2, wm_shelf));
+  menu.reset(new ArcLauncherContextMenu(controller(), item2, shelf));
 
   EXPECT_FALSE(
       IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));
   EXPECT_FALSE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE));
 
   // Shelf group context menu.
   std::vector<arc::mojom::ShortcutInfo> shortcuts = arc_test().fake_shortcuts();
   shortcuts[0].intent_uri +=
       ";S.org.chromium.arc.shelf_group_id=arc_test_shelf_group;end";
   arc_test().app_instance()->SendInstallShortcuts(shortcuts);
   const std::string app_id3 =
       arc::ArcAppShelfId("arc_test_shelf_group",
                          ArcAppTest::GetAppId(arc_test().fake_apps()[2]))
           .ToString();
   std::string window_app_id3("org.chromium.arc.3");
   CreateArcWindow(window_app_id3);
   arc_test().app_instance()->SendTaskCreated(3, arc_test().fake_apps()[2],
                                              shortcuts[0].intent_uri);
   const ash::ShelfItem* item3 = controller()->GetItem(ash::ShelfID(app_id3));
   ASSERT_TRUE(item3);
-  menu.reset(new ArcLauncherContextMenu(controller(), item3, wm_shelf));
+  menu.reset(new ArcLauncherContextMenu(controller(), item3, shelf));
 
   EXPECT_FALSE(
       IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));
   EXPECT_FALSE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE));
 }
 
 // Tests that fullscreen which makes "Autohide shelf" option disappeared on
 // shelf is a per-display setting (crbug.com/496681).
 TEST_F(LauncherContextMenuTest, AutohideShelfOptionOnExternalDisplay) {
   UpdateDisplay("940x550,940x550");
   int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   int64_t secondary_id = display_manager()->GetSecondaryDisplay().id();
 
   // Create a normal window on primary display.
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.context = ash::Shell::GetPrimaryRootWindow();
   widget->Init(params);
   widget->Show();
 
   widget->SetFullscreen(true);
   std::unique_ptr<LauncherContextMenu> primary_menu(CreateLauncherContextMenu(
-      ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(primary_id)));
+      ash::TYPE_BROWSER_SHORTCUT, GetShelf(primary_id)));
   std::unique_ptr<LauncherContextMenu> secondary_menu(CreateLauncherContextMenu(
-      ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(secondary_id)));
+      ash::TYPE_BROWSER_SHORTCUT, GetShelf(secondary_id)));
   EXPECT_FALSE(IsItemPresentInMenu(primary_menu.get(),
                                    LauncherContextMenu::MENU_AUTO_HIDE));
   EXPECT_TRUE(IsItemPresentInMenu(secondary_menu.get(),
                                   LauncherContextMenu::MENU_AUTO_HIDE));
 }
 
 }  // namespace