Adds support for multiple displays to WmTestBase

ash/mus/window_manager.h

Index: ash/mus/window_manager.h
diff --git a/ash/mus/window_manager.h b/ash/mus/window_manager.h
index 8d6ff15c88c043381daa2c241b06037002c5a762..7725ff05f9736eb322d43fa850d1a09b8c8761d5 100644
--- a/ash/mus/window_manager.h
+++ b/ash/mus/window_manager.h
@@ -94,12 +94,23 @@ class WindowManager : public ui::WindowManagerDelegate,
  private:
   friend class WmTestHelper;
 
+  using RootWindowControllers = std::set<std::unique_ptr<RootWindowController>>;
+
   RootWindowController* CreateRootWindowController(
       ui::Window* window,
       const display::Display& display);
 
+  // Removes a Display by window.

[msw, 2016/09/12 22:01:51]

nit: "Removes a Display with the given [root] window." or similar?
(optionally handle non-root windows?)

[sky, 2016/09/12 23:11:28]

I ended up renaming this to DestroyRootWindowController.

+  void RemoveDisplay(ui::Window* window);
+
   void Shutdown();
 
+  // Returns an iterator into |root_window_controllers_|. Returns
+  // root_window_controllers_.end() if |window| is not the root of a
+  // RootWindowController.
+  RootWindowControllers::iterator FindRootWindowControllerByWindow(
+      ui::Window* window);
+
   // ui::WindowObserver:
   void OnWindowDestroying(ui::Window* window) override;
   void OnWindowDestroyed(ui::Window* window) override;
@@ -143,7 +154,7 @@ class WindowManager : public ui::WindowManagerDelegate,
 
   std::unique_ptr<ShadowController> shadow_controller_;
 
-  std::set<std::unique_ptr<RootWindowController>> root_window_controllers_;
+  RootWindowControllers root_window_controllers_;
 
   base::ObserverList<WindowManagerObserver> observers_;