mash: Migrate ShellDelegate ownership and access to WmShell.

ash/test/test_shell_delegate.h

 // 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.
 
 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_
 #define ASH_TEST_TEST_SHELL_DELEGATE_H_
 
 #include <memory>
 #include <string>
 
 #include "ash/common/media_delegate.h"
-#include "ash/shell_delegate.h"
+#include "ash/common/shell_delegate.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 
 namespace app_list {
 class AppListPresenterDelegateFactory;
 class AppListPresenterImpl;
 }
 
 namespace keyboard {
@@ skipping 58 matching lines @@
 
  private:
   int num_exit_requests_;
   bool multi_profiles_enabled_;
   bool force_maximize_on_first_run_;
 
   std::unique_ptr<app_list::AppListPresenterDelegateFactory>
       app_list_presenter_delegate_factory_;
   std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;
 
-  base::ObserverList<ash::VirtualKeyboardStateObserver>
+  base::ObserverList<VirtualKeyboardStateObserver>
       keyboard_state_observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_TEST_SHELL_DELEGATE_H_