mash: Use mojo for ShelfItemDelegate and [app] MenuItem.

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

 // Copyright 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/chrome_launcher_controller_impl.h"
 
 #include <stddef.h>
 
 #include "ash/common/shelf/app_list_button.h"
 #include "ash/common/shelf/shelf_button.h"
@@ skipping 60 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/views/app_list_item_view.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/start_page_view.h"
 #include "ui/app_list/views/tile_item_view.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/display/test/display_manager_test_api.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/test/event_generator.h"
 
 using ash::WmShelf;
 using extensions::AppWindow;
 using extensions::Extension;
 using content::WebContents;
 
 namespace {
 
 ChromeLauncherControllerImpl* GetChromeLauncherControllerImpl() {
   return static_cast<ChromeLauncherControllerImpl*>(
       ChromeLauncherController::instance());
 }
 
+// A callback that records the action taken when a shelf item is selected.
+void SelectItemCallback(ash::ShelfAction* action_taken,
+                        base::RunLoop* run_loop,
+                        ash::ShelfAction action,
+                        base::Optional<MenuItemList>) {
+  *action_taken = action;
+  run_loop->Quit();
+}
+
 // Calls ShelfItemDelegate::SelectItem with an event type and default arguments.
-ash::ShelfAction SelectItem(ash::ShelfItemDelegate* delegate,
+ash::ShelfAction SelectItem(ash::mojom::ShelfItemDelegate* delegate,
                             ui::EventType event_type) {
-  return delegate->ItemSelected(event_type, ui::EF_NONE,
-                                display::kInvalidDisplayId,
-                                ash::LAUNCH_FROM_UNKNOWN);
+  std::unique_ptr<ui::Event> event;
+  if (event_type == ui::ET_MOUSE_PRESSED) {
+    event =
+        base::MakeUnique<ui::MouseEvent>(event_type, gfx::Point(), gfx::Point(),
+                                         ui::EventTimeForNow(), ui::EF_NONE, 0);
+  } else if (event_type == ui::ET_KEY_RELEASED) {
+    event = base::MakeUnique<ui::KeyEvent>(event_type, ui::VKEY_UNKNOWN,
+                                           ui::EF_NONE);
+  }
+
+  base::RunLoop run_loop;
+  ash::ShelfAction action = ash::SHELF_ACTION_NONE;
+  delegate->ItemSelected(std::move(event), display::kInvalidDisplayId,
+                         ash::LAUNCH_FROM_UNKNOWN,
+                         base::Bind(&SelectItemCallback, &action, &run_loop));
+  run_loop.Run();
+  return action;
 }
 
 class TestEvent : public ui::Event {
  public:
   explicit TestEvent(ui::EventType type)
       : ui::Event(type, base::TimeTicks(), 0) {}
   ~TestEvent() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestEvent);
@@ skipping 652 matching lines @@
   AppWindow* panel =
       CreateAppWindowFromParams(browser()->profile(), extension1, params);
   EXPECT_TRUE(panel->GetNativeWindow()->IsVisible());
   // Panels should not be active by default.
   EXPECT_FALSE(panel->GetBaseWindow()->IsActive());
   // Confirm that an item delegate was created and is in the correct state.
   const ash::ShelfItem& item1 = GetLastLauncherPanelItem();
   EXPECT_EQ(ash::TYPE_APP_PANEL, item1.type);
   EXPECT_EQ(ash::STATUS_RUNNING, item1.status);
   EXPECT_EQ(nullptr, GetItemController(item1.id));
-  ash::ShelfItemDelegate* item1_delegate =
+  ash::mojom::ShelfItemDelegate* item1_delegate =
       shelf_model()->GetShelfItemDelegate(item1.id);
   EXPECT_EQ(ash::TYPE_APP_PANEL,
             panel->GetNativeWindow()->GetProperty(ash::kShelfItemTypeKey));
   // Click the item and confirm that the panel is activated.
   SelectItem(item1_delegate, ui::ET_MOUSE_PRESSED);
   EXPECT_TRUE(panel->GetBaseWindow()->IsActive());
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
   // Click the item again and confirm that the panel is minimized.
   SelectItem(item1_delegate, ui::ET_MOUSE_PRESSED);
   EXPECT_TRUE(panel->GetBaseWindow()->IsMinimized());
@@ skipping 19 matching lines @@
   AppWindow* panel =
       CreateAppWindowFromParams(browser()->profile(), extension1, params);
   EXPECT_TRUE(panel->GetNativeWindow()->IsVisible());
   // Panels should not be active by default.
   EXPECT_FALSE(panel->GetBaseWindow()->IsActive());
   // Confirm that an item delegate was created and is in the correct state.
   const ash::ShelfItem& item1 = GetLastLauncherPanelItem();
   EXPECT_EQ(ash::TYPE_APP_PANEL, item1.type);
   EXPECT_EQ(ash::STATUS_RUNNING, item1.status);
   EXPECT_EQ(nullptr, GetItemController(item1.id));
-  ash::ShelfItemDelegate* item1_delegate =
+  ash::mojom::ShelfItemDelegate* item1_delegate =
       shelf_model()->GetShelfItemDelegate(item1.id);
   EXPECT_EQ(ash::TYPE_APP_PANEL,
             panel->GetNativeWindow()->GetProperty(ash::kShelfItemTypeKey));
   // Click the item and confirm that the panel is activated.
   SelectItem(item1_delegate, ui::ET_MOUSE_PRESSED);
   EXPECT_TRUE(panel->GetBaseWindow()->IsActive());
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
   // Click the item again and confirm that the panel is minimized.
   SelectItem(item1_delegate, ui::ET_MOUSE_PRESSED);
   EXPECT_TRUE(panel->GetBaseWindow()->IsMinimized());
@@ skipping 687 matching lines @@
   params.focused = false;
   AppWindow* panel =
       CreateAppWindowFromParams(browser()->profile(), extension, params);
   EXPECT_TRUE(panel->GetNativeWindow()->IsVisible());
   // Panels should not be active by default.
   EXPECT_FALSE(panel->GetBaseWindow()->IsActive());
   // Confirm that a shelf item was created and is the correct state.
   const ash::ShelfItem& item = GetLastLauncherPanelItem();
   // Panels are handled by ShelfWindowWatcher, not ChromeLauncherController.
   EXPECT_EQ(nullptr, GetItemController(item.id));
-  ash::ShelfItemDelegate* shelf_item_delegate =
+  ash::mojom::ShelfItemDelegate* shelf_item_delegate =
       shelf_model()->GetShelfItemDelegate(item.id);
   EXPECT_NE(nullptr, shelf_item_delegate);
   EXPECT_EQ(ash::TYPE_APP_PANEL, item.type);
   EXPECT_EQ(ash::STATUS_RUNNING, item.status);
 
   // App windows should go to attention state.
   panel->GetNativeWindow()->SetProperty(aura::client::kDrawAttentionKey, true);
   EXPECT_EQ(ash::STATUS_ATTENTION, item.status);
 
   // Click the item and confirm that the panel is activated.
@@ skipping 858 matching lines @@
 
   // Close all windows via the menu item.
   CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
   EXPECT_EQ(0u, BrowserList::GetInstance()->size());
 
   // Check if "Close" is removed from the context menu.
   std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
   ASSERT_FALSE(
       IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
 }