ash: Convert ShelfDelegate to use WmShelf* instead of Shelf*

ash/test/test_shelf_delegate.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/test/test_shelf_delegate.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
@@ skipping 67 matching lines @@
 
 void TestShelfDelegate::OnWindowHierarchyChanging(
     const HierarchyChangeParams& params) {
   // The window may be legitimately reparented while staying open if it moves
   // to another display or container. If the window does not have a new parent
   // then remove the shelf item.
   if (!params.new_parent)
     RemoveShelfItemForWindow(params.target);
 }
 
-void TestShelfDelegate::OnShelfCreated(Shelf* shelf) {}
+void TestShelfDelegate::OnShelfCreated(WmShelf* shelf) {}
 
-void TestShelfDelegate::OnShelfDestroyed(Shelf* shelf) {}
+void TestShelfDelegate::OnShelfDestroyed(WmShelf* shelf) {}
 
-void TestShelfDelegate::OnShelfAlignmentChanged(Shelf* shelf) {}
+void TestShelfDelegate::OnShelfAlignmentChanged(WmShelf* shelf) {}
 
-void TestShelfDelegate::OnShelfAutoHideBehaviorChanged(Shelf* shelf) {}
+void TestShelfDelegate::OnShelfAutoHideBehaviorChanged(WmShelf* shelf) {}
 
-void TestShelfDelegate::OnShelfAutoHideStateChanged(Shelf* shelf) {}
+void TestShelfDelegate::OnShelfAutoHideStateChanged(WmShelf* shelf) {}
 
-void TestShelfDelegate::OnShelfVisibilityStateChanged(Shelf* shelf) {}
+void TestShelfDelegate::OnShelfVisibilityStateChanged(WmShelf* shelf) {}
 
 ShelfID TestShelfDelegate::GetShelfIDForAppID(const std::string& app_id) {
   for (auto const& iter : shelf_id_to_app_id_map_) {
     if (iter.second == app_id)
       return iter.first;
   }
   return 0;
 }
 
 bool TestShelfDelegate::HasShelfIDToAppIDMapping(ShelfID id) const {
@@ skipping 21 matching lines @@
                                                  const std::string& app_id) {
   shelf_id_to_app_id_map_[shelf_id] = app_id;
 }
 
 void TestShelfDelegate::RemoveShelfIDToAppIDMapping(ShelfID shelf_id) {
   shelf_id_to_app_id_map_.erase(shelf_id);
 }
 
 }  // namespace test
 }  // namespace ash