Revert of arc: Handle non-launchable apps.

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 "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
@@ skipping 154 matching lines @@
        DesktopShellLauncherContextMenuVerifyCloseItem) {
   std::unique_ptr<LauncherContextMenu> menu(
       CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT));
   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));
+  arc_test().app_instance()->SendRefreshAppList(arc_test().fake_apps());
   const std::string app_id = ArcAppTest::GetAppId(arc_test().fake_apps()[0]);
 
   controller()->PinAppWithID(app_id);
 
   ash::ShelfItem item;
   item.id = controller()->GetShelfIDForAppID(app_id);
   ash::WmShelf* wm_shelf = GetWmShelf();
 
   std::unique_ptr<LauncherContextMenu> menu(
       new ArcLauncherContextMenu(controller(), &item, wm_shelf));
@@ skipping 26 matching lines @@
   CreateArcWindow(window_app_id1);
   arc_test().app_instance()->SendTaskCreated(1, arc_test().fake_apps()[0]);
   menu.reset(new ArcLauncherContextMenu(controller(), &item, wm_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]);
-  arc_test().app_instance()->SendTaskCreated(2, arc_test().fake_apps()[1]);
-  item.id = controller()->GetShelfIDForAppID(app_id2);
-  ASSERT_TRUE(item.id);
-  menu.reset(new ArcLauncherContextMenu(controller(), &item, wm_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));
 }