mash: Fold ShelfItemDelegateManager into ShelfModel

ash/common/shelf/shelf_model_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/common/shelf/shelf_model.h"
 
 #include <set>
 #include <string>
 
 #include "ash/common/shelf/shelf_model_observer.h"
@@ skipping 27 matching lines @@
 
   // ShelfModelObserver overrides:
   void ShelfItemAdded(int index) override { added_count_++; }
   void ShelfItemRemoved(int index, ShelfID id) override { removed_count_++; }
   void ShelfItemChanged(int index, const ShelfItem& old_item) override {
     changed_count_++;
   }
   void ShelfItemMoved(int start_index, int target_index) override {
     moved_count_++;
   }
+  void OnSetShelfItemDelegate(ShelfID id,
+                              ShelfItemDelegate* item_delegate) override {}
 
  private:
   void AddToResult(const std::string& format, int count, std::string* result) {
     if (!count)
       return;
     if (!result->empty())
       *result += " ";
     *result += base::StringPrintf(format.c_str(), count);
   }
 
@@ skipping 281 matching lines @@
   // Now change the type of the second item and make sure that it is moving
   // behind the shortcuts.
   item.type = TYPE_PLATFORM_APP;
   model_->Set(app2_index, item);
 
   // The item should have moved in front of the app launcher.
   EXPECT_EQ(TYPE_PLATFORM_APP, model_->items()[4].type);
 }
 
 }  // namespace ash