Use mojo SystemTray interfaces for both mash and classic ash

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/media_delegate.h"
@@ skipping 97 matching lines @@
 
 }  // namespace
 
 ShellDelegateMus::ShellDelegateMus(shell::Connector* connector)
     : connector_(connector), app_list_presenter_(connector) {
   // |connector_| may be null in tests.
 }
 
 ShellDelegateMus::~ShellDelegateMus() {}
 
+::shell::Connector* ShellDelegateMus::GetShellConnector() const {
+  return connector_;
+}
+
 bool ShellDelegateMus::IsFirstRunAfterBoot() const {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool ShellDelegateMus::IsIncognitoAllowed() const {
   NOTIMPLEMENTED();
   return false;
 }
 
@@ skipping 41 matching lines @@
 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {
   return &app_list_presenter_;
 }
 
 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
   return new ShelfDelegateMus(WmShell::Get()->shelf_model());
 }
 
 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
 #if defined(OS_CHROMEOS)
-  return new SystemTrayDelegateMus(connector_);
+  return new SystemTrayDelegateMus();
 #else
   // Windows and Linux do not support the services required for most system tray
   // items. Use the same stub delegate as ash_shell_with_content.
   return new DefaultSystemTrayDelegate();
 #endif
 }
 
 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {
   return base::MakeUnique<WallpaperDelegateMus>(connector_);
 }
@@ skipping 39 matching lines @@
   NOTIMPLEMENTED();
   return base::string16();
 }
 
 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
   NOTIMPLEMENTED();
   return gfx::Image();
 }
 
 }  // namespace ash