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

ash/root_window_controller.cc

 // Copyright (c) 2012 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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/aura/aura_layout_manager_adapter.h"
@@ skipping 460 matching lines @@
   if (shelf_)
     return;
   ShelfView* shelf_view = shelf_widget_->CreateShelfView();
 
   shelf_.reset(
       new Shelf(wm_shelf_aura_.get(), shelf_view, shelf_widget_.get()));
   shelf_widget_->set_shelf(shelf_.get());
   // Must be initialized before the delegate is notified because the delegate
   // may try to access the WmShelf.
   wm_shelf_aura_->SetShelf(shelf_.get());
-  WmShell::Get()->shelf_delegate()->OnShelfCreated(shelf_.get());
+  WmShell::Get()->shelf_delegate()->OnShelfCreated(wm_shelf_aura_.get());
 
   if (panel_layout_manager_)
     panel_layout_manager_->SetShelf(wm_shelf_aura_.get());
   if (docked_layout_manager_) {
     docked_layout_manager_->SetShelf(wm_shelf_aura_.get());
     if (shelf_widget_->shelf_layout_manager())
       docked_layout_manager_->AddObserver(
           shelf_widget_->shelf_layout_manager());
   }
 
@@ skipping 467 matching lines @@
     aura::Window* primary_root_window = Shell::GetInstance()
                                             ->window_tree_host_manager()
                                             ->GetPrimaryRootWindow();
     return GetRootWindowSettings(primary_root_window)->controller;
   }
 
   return GetRootWindowSettings(root_window)->controller;
 }
 
 }  // namespace ash