Get AcceleratorControllerTest working with mash

ash/mus/bridge/wm_shell_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_BRIDGE_WM_SHELL_MUS_H_
 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 12 matching lines @@
 class WindowTreeClient;
 }
 
 namespace ash {
 namespace mus {
 
 class AcceleratorControllerDelegateMus;
 class AcceleratorControllerRegistrar;
 class WindowManager;
 class WmRootWindowControllerMus;
+class WmShellMusTestApi;
 class WmWindowMus;
 
 // WmShell implementation for mus.
 class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {
  public:
   WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
              WindowManager* window_manager);
   ~WmShellMus() override;
 
   static WmShellMus* Get();
@@ skipping 47 matching lines @@
   void RemoveActivationObserver(WmActivationObserver* observer) override;
   void AddDisplayObserver(WmDisplayObserver* observer) override;
   void RemoveDisplayObserver(WmDisplayObserver* observer) override;
   void AddPointerWatcher(views::PointerWatcher* watcher) override;
   void RemovePointerWatcher(views::PointerWatcher* watcher) override;
 #if defined(OS_CHROMEOS)
   void ToggleIgnoreExternalKeyboard() override;
 #endif
 
  private:
+  friend class WmShellMusTestApi;
+
   ui::WindowTreeClient* window_tree_client();
 
   // Returns true if |window| is a window that can have active children.
   static bool IsActivationParent(ui::Window* window);
 
   // ui::WindowTreeClientObserver:
   void OnWindowTreeFocusChanged(ui::Window* gained_focus,
                                 ui::Window* lost_focus) override;
   void OnDidDestroyClient(ui::WindowTreeClient* client) override;
 
   WindowManager* window_manager_;
 
   std::vector<WmRootWindowControllerMus*> root_window_controllers_;
 
   std::unique_ptr<AcceleratorControllerDelegateMus>
       accelerator_controller_delegate_;
   std::unique_ptr<AcceleratorControllerRegistrar>
       accelerator_controller_registrar_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
 
   base::ObserverList<WmActivationObserver> activation_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShellMus);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_