Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/common/test/test_shelf_item_delegate.h

Index: ash/common/test/test_shelf_item_delegate.h
diff --git a/ash/common/test/test_shelf_item_delegate.h b/ash/common/test/test_shelf_item_delegate.h
index a2f7893e771bf6e1266970640203ca8ad2801f4c..f1a259fe859ac182212f4009a8fcdacab243fca7 100644
--- a/ash/common/test/test_shelf_item_delegate.h
+++ b/ash/common/test/test_shelf_item_delegate.h
@@ -21,8 +21,10 @@ class TestShelfItemDelegate : public ShelfItemDelegate {
   ~TestShelfItemDelegate() override;
 
   // ShelfItemDelegate:
-  ShelfItemDelegate::PerformedAction ItemSelected(
-      const ui::Event& event) override;
+  ShelfAction ItemSelected(ui::EventType event_type,
+                           int event_flags,
+                           int64_t display_id,
+                           ShelfLaunchSource source) override;
   ShelfAppMenuItemList GetAppMenuItems(int event_flags) override;
   void Close() override;