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

ash/shelf/shelf_unittest.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 <utility>
 
 #include "ash/common/shelf/shelf_button.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_view.h"
 #include "ash/common/shelf/shelf_widget.h"
@@ skipping 54 matching lines @@
 TEST_F(ShelfTest, CheckHoverAfterMenu) {
   // Initially we have the app list.
   int button_count = test_api()->GetButtonCount();
 
   // Add a running app.
   ShelfItem item;
   item.type = TYPE_APP;
   item.status = STATUS_RUNNING;
   int index = shelf_model()->Add(item);
 
-  std::unique_ptr<ShelfItemDelegate> delegate(
-      new test::TestShelfItemDelegate(NULL));
-  shelf_model()->SetShelfItemDelegate(shelf_model()->items()[index].id,
-                                      std::move(delegate));
+  shelf_model()->SetShelfItemDelegate(
+      shelf_model()->items()[index].id,
+      base::MakeUnique<test::TestShelfItemDelegate>(nullptr));
 
   ASSERT_EQ(++button_count, test_api()->GetButtonCount());
   ShelfButton* button = test_api()->GetButton(index);
   button->AddState(ShelfButton::STATE_HOVERED);
   button->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
   EXPECT_FALSE(button->state() & ShelfButton::STATE_HOVERED);
 
   // Remove it.
   shelf_model()->RemoveItemAt(index);
 }
@@ skipping 20 matching lines @@
 
   // Removes the first item in main shelf view.
   shelf_model()->RemoveItemAt(shelf_model()->ItemIndexByID(first_item_id));
 
   // Waits for all transitions to finish and there should be no crash.
   test_api()->RunMessageLoopUntilAnimationsDone();
   EXPECT_FALSE(shelf_widget->IsShowingOverflowBubble());
 }
 
 }  // namespace ash