mash: Migrate shelf app list button to wm common types

ash/test/shell_test_api.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/test/shell_test_api.h"
 
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/display/display_configuration_controller.h"
@@ skipping 16 matching lines @@
 
 ScreenPositionController* ShellTestApi::screen_position_controller() {
   return shell_->screen_position_controller_.get();
 }
 
 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() {
   return shell_->native_cursor_manager_;
 }
 
 ShelfModel* ShellTestApi::shelf_model() {
-  return shell_->shelf_model_.get();
+  // TODO(jamescook): Remove this and access WmShell::shelf_model() directly.
+  return shell_->wm_shell_->shelf_model();
 }
 
 DragDropController* ShellTestApi::drag_drop_controller() {
   return shell_->drag_drop_controller_.get();
 }
 
 app_list::AppListPresenter* ShellTestApi::app_list_presenter() {
   return shell_->wm_shell_->delegate()->GetAppListPresenter();
 }
 
 void ShellTestApi::DisableDisplayAnimator() {
   shell_->display_configuration_controller()->ResetAnimatorForTest();
 }
 
 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) {
   shell_->shelf_delegate_.reset(delegate);
 }
 
 void ShellTestApi::SetSessionStateDelegate(
     SessionStateDelegate* session_state_delegate) {
   shell_->session_state_delegate_.reset(session_state_delegate);
 }
 
 }  // namespace test
 }  // namespace ash