Cleanup display creation in mus tests.

services/ui/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 SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
+#include <set>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
+#include "services/ui/display/platform_screen.h"
+#include "services/ui/display/viewport_metrics.h"
 #include "services/ui/public/interfaces/display_manager.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_binding.h"
 #include "services/ui/ws/drag_controller.h"
 #include "services/ui/ws/event_dispatcher.h"
 #include "services/ui/ws/frame_generator_delegate.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/platform_display_factory.h"
 #include "services/ui/ws/test_change_tracker.h"
 #include "services/ui/ws/user_activity_monitor.h"
 #include "services/ui/ws/user_display_manager.h"
 #include "services/ui/ws/user_id.h"
 #include "services/ui/ws/window_manager_state.h"
 #include "services/ui/ws/window_manager_window_tree_factory_set.h"
 #include "services/ui/ws/window_server_delegate.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
+#include "ui/display/display.h"
 
 namespace ui {
 namespace ws {
 namespace test {
 
 // Collection of utilities useful in creating mus tests.
 
+// Test PlatformDisplay instance that allows adding/modifying/removing displays.
+// Tracks display ids to perform some basic verification that no duplicates are
+// added and displays was added before being modified or removed.
+class TestPlatformScreen : public display::PlatformScreen {
+ public:
+  TestPlatformScreen();
+  ~TestPlatformScreen() override;
+
+  // Adds a new display with default metrics, generates a unique display id and
+  // returns it. Calls OnDisplayAdded() on delegate.
+  int64_t AddDisplay();
+
+  // Adds a new display with provided |metrics|, generates a unique display id
+  // and returns it. Calls OnDisplayAdded() on delegate.
+  int64_t AddDisplay(const display::ViewportMetrics& metrics);
+
+  // Calls OnDisplayModified() on delegate.
+  void ModifyDisplay(int64_t id, const display::ViewportMetrics& metrics);
+
+  // Calls OnDisplayRemoved() on delegate.
+  void RemoveDisplay(int64_t id);
+
+  // display::PlatformScreen:
+  void AddInterfaces(service_manager::InterfaceRegistry* registry) override {}
+  void Init(display::PlatformScreenDelegate* delegate) override;
+  void RequestCloseDisplay(int64_t display_id) override {}
+  int64_t GetPrimaryDisplayId() const override;
+
+ private:
+  display::PlatformScreenDelegate* delegate_;
+  int64_t primary_display_id_ = display::Display::kInvalidDisplayID;
+  std::set<int64_t> display_ids_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestPlatformScreen);
+};
+
+// -----------------------------------------------------------------------------
+
 class UserDisplayManagerTestApi {
  public:
   explicit UserDisplayManagerTestApi(UserDisplayManager* udm) : udm_(udm) {}
   ~UserDisplayManagerTestApi() {}
 
   void SetTestObserver(mojom::DisplayManagerObserver* observer) {
     udm_->test_observer_ = observer;
     if (observer)
       udm_->OnObserverAdded(observer);
   }
@@ skipping 186 matching lines @@
   WindowServer* window_server_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayBinding);
 };
 
 // -----------------------------------------------------------------------------
 
 // Factory that dispenses TestPlatformDisplays.
 class TestPlatformDisplayFactory : public PlatformDisplayFactory {
  public:
-  static const int64_t kFirstDisplayId;
-
   explicit TestPlatformDisplayFactory(mojom::Cursor* cursor_storage);
   ~TestPlatformDisplayFactory();
 
   // PlatformDisplayFactory:
-  std::unique_ptr<PlatformDisplay> CreatePlatformDisplay() override;
+  std::unique_ptr<PlatformDisplay> CreatePlatformDisplay(
+      const PlatformDisplayInitParams& init_params) override;
 
  private:
   mojom::Cursor* cursor_storage_;
-  int64_t next_display_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplayFactory);
 };
 
 // -----------------------------------------------------------------------------
 
 // A stub implementation of FrameGeneratorDelegate.
 class TestFrameGeneratorDelegate : public FrameGeneratorDelegate {
  public:
   TestFrameGeneratorDelegate();
@@ skipping 243 matching lines @@
     return last_binding() ? last_binding()->client() : nullptr;
   }
   TestWindowTreeBinding* last_binding() {
     return bindings_.empty() ? nullptr : bindings_.back();
   }
 
   std::vector<TestWindowTreeBinding*>* bindings() { return &bindings_; }
 
   bool got_on_no_more_displays() const { return got_on_no_more_displays_; }
 
-  // Creates |num_displays| displays.
-  void CreateDisplays(int num_displays);
-
-  Display* AddDisplay();
-
   // WindowServerDelegate:
   void StartDisplayInit() override;
   void OnNoMoreDisplays() override;
   std::unique_ptr<WindowTreeBinding> CreateWindowTreeBinding(
       BindingType type,
       ws::WindowServer* window_server,
       ws::WindowTree* tree,
       mojom::WindowTreeRequest* tree_request,
       mojom::WindowTreeClientPtr* client) override;
   bool IsTestConfig() const override;
@@ skipping 85 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(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);
 
+// Create a new ViewportMetrics object with specified bounds, size and
+// scale factor. Bounds origin, |origin_x| and |origin_y|, are in DIP and bounds
+// size is computed.
+display::ViewportMetrics MakeViewportMetrics(int origin_x,
+                                             int origin_y,
+                                             int width_pixels,
+                                             int height_pixels,
+                                             float scale_factor);
+
 // 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| is 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 ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_