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

ash/common/shelf/shelf_application_menu_model_unittest.cc

 // Copyright 2015 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 "ash/common/shelf/shelf_application_menu_model.h"
 
 #include <utility>
 
 #include "ash/common/test/test_shelf_item_delegate.h"
-#include "ash/public/cpp/shelf_application_menu_item.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 22 matching lines @@
  private:
   // The ShelfApplicationMenuModel to provide internal access to. Not owned.
   ShelfApplicationMenuModel* menu_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfApplicationMenuModelTestAPI);
 };
 
 // Verifies the menu contents given an empty item list.
 TEST(ShelfApplicationMenuModelTest, VerifyContentsWithNoMenuItems) {
   base::string16 title = base::ASCIIToUTF16("title");
-  ShelfApplicationMenuModel menu(title, ShelfAppMenuItemList(), nullptr);
+  ShelfApplicationMenuModel menu(title, ShelfItemDelegate::MenuItemList(),
+                                 nullptr);
   // Expect the title with separators.
   ASSERT_EQ(static_cast<int>(3), menu.GetItemCount());
   EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, menu.GetTypeAt(0));
   EXPECT_EQ(ui::MenuModel::TYPE_COMMAND, menu.GetTypeAt(1));
   EXPECT_EQ(title, menu.GetLabelAt(1));
   EXPECT_FALSE(menu.IsEnabledAt(1));
   EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, menu.GetTypeAt(2));
 }
 
 // Verifies the menu contents given a non-empty item list.
 TEST(ShelfApplicationMenuModelTest, VerifyContentsWithMenuItems) {
-  ShelfAppMenuItemList items;
+  ShelfItemDelegate::MenuItemList items;
   base::string16 title1 = base::ASCIIToUTF16("title1");
   base::string16 title2 = base::ASCIIToUTF16("title2");
   base::string16 title3 = base::ASCIIToUTF16("title3");
-  items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(0, title1));
-  items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(1, title2));
-  items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(2, title3));
+  items.push_back(ash::mojom::MenuItem::New());
+  items[0]->label = title1;
+  items.push_back(ash::mojom::MenuItem::New());
+  items[1]->label = title2;
+  items.push_back(ash::mojom::MenuItem::New());
+  items[2]->label = title3;
 
   base::string16 title = base::ASCIIToUTF16("title");
   ShelfApplicationMenuModel menu(title, std::move(items), nullptr);
   ShelfApplicationMenuModelTestAPI menu_test_api(&menu);
 
   // Expect the title with separators, the enabled items, and another separator.
   ASSERT_EQ(static_cast<int>(7), menu.GetItemCount());
   EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, menu.GetTypeAt(0));
   EXPECT_EQ(ui::MenuModel::TYPE_COMMAND, menu.GetTypeAt(1));
   EXPECT_EQ(title, menu.GetLabelAt(1));
@@ skipping 11 matching lines @@
   EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, menu.GetTypeAt(6));
 }
 
 // Verifies RecordMenuItemSelectedMetrics uses the correct histogram buckets.
 TEST(ShelfApplicationMenuModelTest, VerifyHistogramBuckets) {
   const int kCommandId = 3;
   const int kNumMenuItemsEnabled = 7;
 
   base::HistogramTester histogram_tester;
 
-  ShelfAppMenuItemList items;
+  ShelfItemDelegate::MenuItemList items;
   ShelfApplicationMenuModel menu(base::ASCIIToUTF16("title"), std::move(items),
                                  nullptr);
   ShelfApplicationMenuModelTestAPI menu_test_api(&menu);
   menu_test_api.RecordMenuItemSelectedMetrics(kCommandId, kNumMenuItemsEnabled);
 
   histogram_tester.ExpectTotalCount(kNumItemsEnabledHistogramName, 1);
   histogram_tester.ExpectBucketCount(kNumItemsEnabledHistogramName,
                                      kNumMenuItemsEnabled, 1);
 
   histogram_tester.ExpectTotalCount(kSelectedMenuItemIndexHistogramName, 1);
   histogram_tester.ExpectBucketCount(kSelectedMenuItemIndexHistogramName,
                                      kCommandId, 1);
 }
 
 // Verify histogram data is recorded when ExecuteCommand is called.
 TEST(ShelfApplicationMenuModelTest, VerifyHistogramOnExecute) {
   base::HistogramTester histogram_tester;
 
-  ShelfAppMenuItemList items;
+  ShelfItemDelegate::MenuItemList items;
+  items.push_back(ash::mojom::MenuItem::New());
+  test::TestShelfItemDelegate test_delegate(nullptr);
   base::string16 title = base::ASCIIToUTF16("title");
-  items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(0, title));
-  test::TestShelfItemDelegate test_delegate(nullptr);
   ShelfApplicationMenuModel menu(title, std::move(items), &test_delegate);
   menu.ExecuteCommand(0, 0);
 
   histogram_tester.ExpectTotalCount(kNumItemsEnabledHistogramName, 1);
   histogram_tester.ExpectTotalCount(kSelectedMenuItemIndexHistogramName, 1);
 }
 
 }  // namespace ash