Converts mash to use Shell

ash/mus/shell_delegate_mus.h

Index: ash/mus/shell_delegate_mus.h
diff --git a/ash/mus/shell_delegate_mus.h b/ash/mus/shell_delegate_mus.h
index fd88232f1ef8c63f9236d9e984536d27cd03c48c..9d280dea762e31946f3fb8e59e3ab7d486c6ba41 100644
--- a/ash/mus/shell_delegate_mus.h
+++ b/ash/mus/shell_delegate_mus.h
@@ -18,7 +18,8 @@ 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:
@@ -50,7 +51,9 @@ class ShellDelegateMus : public ShellDelegate {
   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);
 };