mash: Port TrayUpdateTest to AshTest

ash/common/wm_shell.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_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 67 matching lines @@
 class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
 class WmRootWindowController;
 class WmWindow;
 class WorkspaceEventHandler;
 
 enum class LoginStatus;
 enum class TaskSwitchSource;
 
+namespace mus {
+class WmTestHelper;
+}
+
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
 }
 
 #if defined(OS_CHROMEOS)
 class LogoutConfirmationController;
 #endif
 
 // Similar to ash::Shell. Eventually the two will be merged.
@@ skipping 352 matching lines @@
 
   void DeleteToastManager();
 
   void SetAcceleratorController(
       std::unique_ptr<AcceleratorController> accelerator_controller);
 
  private:
   friend class AcceleratorControllerTest;
   friend class ScopedRootWindowForNewWindows;
   friend class Shell;
+  friend class mus::WmTestHelper;

[James Cook, 2016/10/11 19:58:37]

Lemme know if you would prefer a WmShellTestApi class.

[sky, 2016/10/11 20:56:24]

I think that would be cleaner, but if you want to do it separately I'm fine with
that.

 
   static WmShell* instance_;
 
   base::ObserverList<ShellObserver> shell_observers_;
   std::unique_ptr<ShellDelegate> delegate_;
 
   std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
   std::unique_ptr<FocusCycler> focus_cycler_;
@@ skipping 29 matching lines @@
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
 #endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_