mash: Migrate ShellDelegate ownership and access to WmShell.

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"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shell.h"
-#include "ash/shell_delegate.h"
 
 namespace ash {
 namespace test {
 
 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
 
 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() {
   return shell_->system_gesture_filter_.get();
 }
 
@@ skipping 11 matching lines @@
 
 ShelfModel* ShellTestApi::shelf_model() {
   return shell_->shelf_model_.get();
 }
 
 DragDropController* ShellTestApi::drag_drop_controller() {
   return shell_->drag_drop_controller_.get();
 }
 
 app_list::AppListPresenter* ShellTestApi::app_list_presenter() {
-  return shell_->delegate_->GetAppListPresenter();
+  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