Converts mash to use Shell

ash/mus/shell_delegate_mus.cc

 // Copyright 2016 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/mus/shell_delegate_mus.h"
 
 #include <utility>
 
 #include "ash/common/gpu_support_stub.h"
 #include "ash/common/palette_delegate.h"
@@ skipping 66 matching lines @@
   bool screen_locked_;
 
   // A pseudo user info.
   std::unique_ptr<user_manager::UserInfo> user_info_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace
 
-ShellDelegateMus::ShellDelegateMus(service_manager::Connector* connector)
-    : connector_(connector) {
-  // |connector_| may be null in tests.
+ShellDelegateMus::ShellDelegateMus(
+    service_manager::Connector* connector,
+    std::unique_ptr<SystemTrayDelegate> system_tray_delegate_for_test)
+    : connector_(connector),
+      system_tray_delegate_for_test_(std::move(system_tray_delegate_for_test)) {
 }
 
 ShellDelegateMus::~ShellDelegateMus() {}
 
 service_manager::Connector* ShellDelegateMus::GetShellConnector() const {
   return connector_;
 }
 
 bool ShellDelegateMus::IsIncognitoAllowed() const {
   NOTIMPLEMENTED();
@@ skipping 39 matching lines @@
 
 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) {
   NOTIMPLEMENTED();
 }
 
 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
   return new ShelfDelegateMus();
 }
 
 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
+  if (system_tray_delegate_for_test_)
+    return system_tray_delegate_for_test_.release();
   return new SystemTrayDelegateMus();
 }
 
 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {
   return base::MakeUnique<WallpaperDelegateMus>();
 }
 
 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
   // TODO: http://crbug.com/647416.
   NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
@@ skipping 39 matching lines @@
 void ShellDelegateMus::SetTouchscreenEnabledInPrefs(bool enabled,
                                                     bool use_local_state) {
   NOTIMPLEMENTED();
 }
 
 void ShellDelegateMus::UpdateTouchscreenStatusFromPrefs() {
   NOTIMPLEMENTED();
 }
 
 }  // namespace ash