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

ash/shelf/shelf_widget_unittest.cc

 // Copyright (c) 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_widget.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_view.h"
@@ skipping 341 matching lines @@
 // OnShelfCreated, to simulate ChromeLauncherController's behavior.
 class TestShelfDelegate : public ShelfDelegate {
  public:
   TestShelfDelegate(ShelfAlignment initial_alignment,
                     ShelfAutoHideBehavior initial_auto_hide_behavior)
       : initial_alignment_(initial_alignment),
         initial_auto_hide_behavior_(initial_auto_hide_behavior) {}
   ~TestShelfDelegate() override {}
 
   // ShelfDelegate implementation.
-  void OnShelfCreated(Shelf* shelf) override {
-    shelf->wm_shelf()->SetAlignment(initial_alignment_);
-    shelf->wm_shelf()->SetAutoHideBehavior(initial_auto_hide_behavior_);
+  void OnShelfCreated(WmShelf* shelf) override {
+    shelf->SetAlignment(initial_alignment_);
+    shelf->SetAutoHideBehavior(initial_auto_hide_behavior_);
   }
-  void OnShelfDestroyed(Shelf* shelf) override {}
-  void OnShelfAlignmentChanged(Shelf* shelf) override {}
-  void OnShelfAutoHideBehaviorChanged(Shelf* shelf) override {}
-  void OnShelfAutoHideStateChanged(Shelf* shelf) override {}
-  void OnShelfVisibilityStateChanged(Shelf* 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 { return 0; }
   bool HasShelfIDToAppIDMapping(ShelfID id) const override { return false; }
   const std::string& GetAppIDForShelfID(ShelfID id) override {
     return base::EmptyString();
   }
   void PinAppWithID(const std::string& app_id) override {}
   bool IsAppPinned(const std::string& app_id) override { return false; }
   void UnpinAppWithID(const std::string& app_id) override {}
 
  private:
@@ skipping 106 matching lines @@
 }
 
 TEST_P(ShelfWidgetTestWithDelegate, CreateLockedShelf) {
   // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior.
   TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED,
                                    SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
                                    SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN);
 }
 
 }  // namespace ash