Delete WindowManagerWindowTreeFactorySetTestApi.

services/ui/ws/test_utils.h

Index: services/ui/ws/test_utils.h
diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
index dee4b23b93fe5641498b19435e14cb444e839dc5..43c4842bb1dc2c8ccce2e8887a835e9d820105c7 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -36,23 +36,6 @@ namespace test {
 
 // Collection of utilities useful in creating mus tests.
 
-class WindowManagerWindowTreeFactorySetTestApi {
- public:
-  explicit WindowManagerWindowTreeFactorySetTestApi(
-      WindowManagerWindowTreeFactorySet*
-          window_manager_window_tree_factory_set);
-  ~WindowManagerWindowTreeFactorySetTestApi();
-
-  void Add(const UserId& user_id);
-
- private:
-  WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set_;
-
-  DISALLOW_COPY_AND_ASSIGN(WindowManagerWindowTreeFactorySetTestApi);
-};
-
-// -----------------------------------------------------------------------------
-
 class UserDisplayManagerTestApi {
  public:
   explicit UserDisplayManagerTestApi(UserDisplayManager* udm) : udm_(udm) {}
@@ -638,6 +621,10 @@ class WindowEventTargetingHelper {
 
 // -----------------------------------------------------------------------------
 
+// Adds a new WM to |window_server| for |user_id|. Creates
+// WindowManagerWindowTreeFactory and associated WindowTree for the WM.
+void AddWindowManager(WindowServer* window_server, const UserId& user_id);
+
 // Returns the first and only root of |tree|. If |tree| has zero or more than
 // one root returns null.
 ServerWindow* FirstRoot(WindowTree* tree);