Converts mash to use Shell

ash/mus/shell_delegate_mus.h

 // 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.
 
 #ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_
 #define ASH_MUS_SHELL_DELEGATE_MUS_H_
 
 #include <memory>
 
 #include "ash/common/shell_delegate.h"
 #include "base/macros.h"
 
 namespace service_manager {
 class Connector;
 }
 
 namespace ash {
 
 class ShellDelegateMus : public ShellDelegate {
  public:
-  explicit ShellDelegateMus(service_manager::Connector* connector);
+  ShellDelegateMus(service_manager::Connector* connector,
+                   std::unique_ptr<SystemTrayDelegate> system_tray_delegate);
   ~ShellDelegateMus() override;
 
   // ShellDelegate:
   service_manager::Connector* GetShellConnector() const override;
   bool IsIncognitoAllowed() const override;
   bool IsMultiProfilesEnabled() const override;
   bool IsRunningInForcedAppMode() const override;
   bool CanShowWindowForUser(WmWindow* window) const override;
   bool IsForceMaximizeOnFirstRun() const override;
   void PreInit() override;
@@ skipping 11 matching lines @@
                                    const ShelfItem* item) override;
   GPUSupport* CreateGPUSupport() override;
   base::string16 GetProductName() const override;
   gfx::Image GetDeprecatedAcceleratorImage() const override;
   bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override;
   void SetTouchscreenEnabledInPrefs(bool enabled,
                                     bool use_local_state) override;
   void UpdateTouchscreenStatusFromPrefs() override;
 
  private:
+  // |connector_| may be null in tests.
   service_manager::Connector* connector_;
+  std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;

[James Cook, 2017/01/18 01:00:24]

Is this only for testing? system_tray_delegate_for_testing_ ?

[sky, 2017/01/18 04:00:07]

Yes. Renamed.

 
   DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
 };
 
 }  // namespace ash
 
 #endif  // ASH_MUS_SHELL_DELEGATE_MUS_H_