Wires up WorkspaceLayoutManager in mash

mash/wm/window_manager_application.h

Index: mash/wm/window_manager_application.h
diff --git a/mash/wm/window_manager_application.h b/mash/wm/window_manager_application.h
index 867e8be974b70838cccfd2766540a308653cc327..b68a3f1a49f45575106155af3f4d011450a82cf8 100644
--- a/mash/wm/window_manager_application.h
+++ b/mash/wm/window_manager_application.h
@@ -25,9 +25,12 @@
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 
+namespace display {
+class Screen;
+}
+
 namespace views {
 class AuraInit;
-class ScreenMus;
 }
 
 namespace ui {
@@ -42,6 +45,9 @@ class RootWindowController;
 class RootWindowsObserver;
 class ShelfLayoutImpl;
 class UserWindowControllerImpl;
+class WmGlobalsMus;
+class WmLookupMus;
+class WmScreen;
 
 class WindowManagerApplication
     : public shell::ShellClient,
@@ -61,6 +67,8 @@ class WindowManagerApplication
   // RootWindowController that has a valid root window.
   std::set<RootWindowController*> GetRootControllers();
 
+  WmGlobalsMus* globals() { return globals_.get(); }
+
   // Called when the root window of |root_controller| is obtained.
   void OnRootWindowControllerGotRoot(RootWindowController* root_controller);
 
@@ -82,8 +90,14 @@ class WindowManagerApplication
   }
 
  private:
+  friend class WmTestBase;
+  friend class WmTestHelper;
+
   void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
 
+  // Adds |root_window_controller| to the set of known roots.
+  void AddRootWindowController(RootWindowController* root_window_controller);
+
   // shell::ShellClient:
   void Initialize(shell::Connector* connector,
                   const shell::Identity& identity,
@@ -113,9 +127,12 @@ class WindowManagerApplication
 
   mojo::TracingImpl tracing_;
 
-  std::unique_ptr<views::ScreenMus> screen_;
+  std::unique_ptr<display::Screen> screen_;
   std::unique_ptr<views::AuraInit> aura_init_;
 
+  std::unique_ptr<WmGlobalsMus> globals_;
+  std::unique_ptr<WmLookupMus> lookup_;
+
   // The |shelf_layout_| object is created once OnEmbed() is called. Until that
   // time |shelf_layout_requests_| stores pending interface requests.
   std::unique_ptr<ShelfLayoutImpl> shelf_layout_;