mash: Cleanup ash shelf application menu code.

ash/shelf/shelf_view_unittest.cc

 // Copyright (c) 2012 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_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 1986 matching lines @@
     ink_drop_->SetFocused(is_focused);
   }
 
   std::unique_ptr<views::InkDrop> ink_drop_;
   std::vector<views::InkDropState> requested_states_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InkDropSpy);
 };
 
-// A menu model that contains minimum number of items needed for a menu to be
-// shown on a shelf item.
-class TestShelfMenuModel : public ui::SimpleMenuModel,
-                           public ui::SimpleMenuModel::Delegate {
- public:
-  TestShelfMenuModel() : ui::SimpleMenuModel(this) { Build(); }
-  ~TestShelfMenuModel() override {}
-
- private:
-  void Build() {
-    // A menu is expected to have at least 6 items. Three spacing separators,
-    // one title, and at least two more items.
-    AddSeparator(ui::SPACING_SEPARATOR);
-    AddItem(0, base::ASCIIToUTF16("Title"));
-    AddSeparator(ui::SPACING_SEPARATOR);
-    AddItem(1, base::ASCIIToUTF16("Item 1"));
-    AddItem(2, base::ASCIIToUTF16("Item 2"));
-    AddSeparator(ui::SPACING_SEPARATOR);
-  }
-
-  // ui::SimpleMenuModel::Delegate:
-  bool IsCommandIdChecked(int command_id) const override { return false; }
-  bool IsCommandIdEnabled(int command_id) const override {
-    return command_id != 0;
-  }
-  void ExecuteCommand(int command_id, int event_flags) override {}
-
-  DISALLOW_COPY_AND_ASSIGN(TestShelfMenuModel);
-};
-
 // A ShelfItemDelegate that returns a menu for the shelf item.
 class ListMenuShelfItemDelegate : public TestShelfItemDelegate {
  public:
   ListMenuShelfItemDelegate() : TestShelfItemDelegate(nullptr) {}
   ~ListMenuShelfItemDelegate() override {}
 
  private:
   // TestShelfItemDelegate:
-  ui::SimpleMenuModel* CreateApplicationMenu(int event_flags) override {
-    return new TestShelfMenuModel;
+  ShelfApplicationMenuItems GetAppMenuItems(int event_flags) override {
+    ShelfApplicationMenuItems items;
+    base::string16 title = base::ASCIIToUTF16("title");
+    items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(title, nullptr));

[James Cook, 2017/02/06 17:30:21]

Given the number of times the (title, nullptr) constructor is used in tests,
WDYT of providing a (title) constructor that uses no icon? It could delegate to
the main constructor.

[msw, 2017/02/07 09:12:01]

Done, I added a default parameter and updated callers that pass nullptr.

+    items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(title, nullptr));
+    return items;
   }
 
   DISALLOW_COPY_AND_ASSIGN(ListMenuShelfItemDelegate);
 };
 
 }  // namespace
 
 // Test fixture that forces material design mode in order to test ink drop
 // ripples on shelf.
 class ShelfViewInkDropTest : public ShelfViewTest {
@@ skipping 991 matching lines @@
   EXPECT_EQ(views::InkDropState::ACTIVATED,
             overflow_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
               IsEmpty());
 
   ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 }
 
 }  // namespace test
 }  // namespace ash