Changes how window manager obtains WindowTree from mus

components/mus/ws/test_utils.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 COMPONENTS_MUS_WS_TEST_UTILS_H_
 #define COMPONENTS_MUS_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "components/mus/public/interfaces/display.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_binding.h"
 #include "components/mus/ws/event_dispatcher.h"
 #include "components/mus/ws/platform_display.h"
 #include "components/mus/ws/platform_display_factory.h"
 #include "components/mus/ws/test_change_tracker.h"
 #include "components/mus/ws/user_display_manager.h"
 #include "components/mus/ws/user_id.h"
-#include "components/mus/ws/window_manager_factory_registry.h"
 #include "components/mus/ws/window_manager_state.h"
+#include "components/mus/ws/window_manager_window_tree_factory_set.h"
 #include "components/mus/ws/window_server_delegate.h"
 #include "components/mus/ws/window_tree.h"
 #include "components/mus/ws/window_tree_binding.h"
 
 namespace mus {
 namespace ws {
 namespace test {
 
 // Collection of utilities useful in creating mus tests.
 
-class WindowManagerFactoryRegistryTestApi {
+class WindowManagerWindowTreeFactorySetTestApi {
  public:
-  explicit WindowManagerFactoryRegistryTestApi(
-      WindowManagerFactoryRegistry* registry);
-  ~WindowManagerFactoryRegistryTestApi();
+  explicit WindowManagerWindowTreeFactorySetTestApi(
+      WindowManagerWindowTreeFactorySet*
+          window_manager_window_tree_factory_set);
+  ~WindowManagerWindowTreeFactorySetTestApi();
 
-  void AddService(const UserId& user_id, mojom::WindowManagerFactory* factory);
+  void Add(const UserId& user_id);
 
  private:
-  WindowManagerFactoryRegistry* registry_;
+  WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set_;
 
-  DISALLOW_COPY_AND_ASSIGN(WindowManagerFactoryRegistryTestApi);
+  DISALLOW_COPY_AND_ASSIGN(WindowManagerWindowTreeFactorySetTestApi);
 };
 
 // -----------------------------------------------------------------------------
 
 class UserDisplayManagerTestApi {
  public:
   explicit UserDisplayManagerTestApi(UserDisplayManager* udm) : udm_(udm) {}
   ~UserDisplayManagerTestApi() {}
 
   void SetTestObserver(mojom::DisplayManagerObserver* observer) {
@@ skipping 169 matching lines @@
     got_create_top_level_window_ = false;
     *change_id = change_id_;
     return true;
   }
 
   bool on_accelerator_called() { return on_accelerator_called_; }
   uint32_t on_accelerator_id() { return on_accelerator_id_; }
 
  private:
   // WindowManager:
+  void OnConnect(uint16_t client_id) override {}
+  void WmNewDisplayAdded(mus::mojom::DisplayPtr display,
+                         mus::mojom::WindowDataPtr root,
+                         bool drawn) override {}
   void WmSetBounds(uint32_t change_id,
                    uint32_t window_id,
                    const gfx::Rect& bounds) override {}
   void WmSetProperty(uint32_t change_id,
                      uint32_t window_id,
                      const mojo::String& name,
                      mojo::Array<uint8_t> value) override {}
   void WmCreateTopLevelWindow(
       uint32_t change_id,
       ClientSpecificId requesting_client_id,
@@ skipping 220 matching lines @@
   scoped_refptr<SurfacesState> surfaces_state_;
   std::unique_ptr<WindowServer> window_server_;
   // Needed to Bind to |wm_client_|
   base::MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowEventTargetingHelper);
 };
 
 // -----------------------------------------------------------------------------
 
-class TestWindowManagerFactory : public mojom::WindowManagerFactory {
- public:
-  TestWindowManagerFactory();
-  ~TestWindowManagerFactory() override;
-
-  // mojom::WindowManagerFactory:
-  void CreateWindowManager(mus::mojom::DisplayPtr display,
-                           mus::mojom::WindowTreeClientRequest client) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestWindowManagerFactory);
-};
-
-// -----------------------------------------------------------------------------
-
 // Returns the first and only root of |tree|. If |tree| has zero or more than
 // one root returns null.
 ServerWindow* FirstRoot(WindowTree* tree);
 
 // Returns the ClientWindowId of the first root of |tree|, or an empty
 // ClientWindowId if |tree| has zero or more than one root.
 ClientWindowId FirstRootId(WindowTree* tree);
 
 // Returns |tree|s ClientWindowId for |window|.
 ClientWindowId ClientWindowIdForWindow(WindowTree* tree,
                                        const ServerWindow* window);
 
 // Creates a new visible window as a child of the single root of |tree|.
 // |client_id| set to the ClientWindowId of the new window.
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
+ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
+                                        ServerWindow* parent,
+                                        ClientWindowId* client_id);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_TEST_UTILS_H_