Use mojo Shelf interfaces for both mash and classic ash.

ash/test/test_shelf_delegate.h

 // 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.
 
 #ifndef ASH_TEST_TEST_SHELF_DELEGATE_H_
 #define ASH_TEST_TEST_SHELF_DELEGATE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 32 matching lines @@
   // exists.
   void RemoveShelfItemForWindow(aura::Window* window);
 
   static TestShelfDelegate* instance() { return instance_; }
 
   // WindowObserver implementation
   void OnWindowDestroying(aura::Window* window) override;
   void OnWindowHierarchyChanging(const HierarchyChangeParams& params) override;
 
   // ShelfDelegate implementation.
-  void OnShelfCreated(WmShelf* shelf) override;
-  void OnShelfDestroyed(WmShelf* shelf) override;
-  void OnShelfAlignmentChanged(WmShelf* shelf) override;
-  void OnShelfAutoHideBehaviorChanged(WmShelf* shelf) override;
-  void OnShelfAutoHideStateChanged(WmShelf* shelf) override;
-  void OnShelfVisibilityStateChanged(WmShelf* shelf) override;
   ShelfID GetShelfIDForAppID(const std::string& app_id) override;
   ShelfID GetShelfIDForAppIDAndLaunchID(const std::string& app_id,
                                         const std::string& launch_id) override;
   bool HasShelfIDToAppIDMapping(ShelfID id) const override;
   const std::string& GetAppIDForShelfID(ShelfID id) override;
   void PinAppWithID(const std::string& app_id) override;
   bool IsAppPinned(const std::string& app_id) override;
   void UnpinAppWithID(const std::string& app_id) override;
 
  private:
@@ skipping 12 matching lines @@
   // Tracks the ShelfID to app id mappings.
   std::map<ShelfID, std::string> shelf_id_to_app_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShelfDelegate);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_TEST_SHELF_DELEGATE_H_