mash: Fold ShelfItemDelegateManager into ShelfModel

ash/shelf/shelf_tooltip_manager_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 "ash/shelf/shelf_tooltip_manager.h"
 
 #include "ash/common/shelf/app_list_button.h"
-#include "ash/common/shelf/shelf_item_delegate_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/test_shelf_item_delegate.h"
 #include "base/memory/ptr_util.h"
@@ skipping 57 matching lines @@
   EXPECT_FALSE(tooltip_manager_->IsVisible());
   tooltip_manager_->ShowTooltipWithDelay(&view);
   EXPECT_FALSE(IsTimerRunning());
 
   // The manager should start the timer for a view on the shelf.
   ShelfModel* model = shelf_view_->model();
   ShelfItem item;
   item.type = TYPE_APP_SHORTCUT;
   const int index = model->Add(item);
   const ShelfID id = model->items()[index].id;
-  Shell::GetInstance()->shelf_item_delegate_manager()->SetShelfItemDelegate(
+  model->SetShelfItemDelegate(
       id, base::WrapUnique(new TestShelfItemDelegate(nullptr)));
   // Note: There's no easy way to correlate shelf a model index/id to its view.
   tooltip_manager_->ShowTooltipWithDelay(
       shelf_view_->child_at(shelf_view_->child_count() - 1));
   EXPECT_TRUE(IsTimerRunning());
 
   // Removing the view won't stop the timer, but the tooltip shouldn't be shown.
   model->RemoveItemAt(index);
   EXPECT_TRUE(IsTimerRunning());
   RunAllPendingInMessageLoop();
@@ skipping 124 matching lines @@
 
   // Should not hide for key events.
   tooltip_manager_->ShowTooltip(shelf_->GetAppListButton());
   ASSERT_TRUE(tooltip_manager_->IsVisible());
   generator.PressKey(ui::VKEY_A, ui::EF_NONE);
   EXPECT_TRUE(tooltip_manager_->IsVisible());
 }
 
 }  // namespace test
 }  // namespace ash