Makes display roots be destroyed by client

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>
@@ skipping 304 matching lines @@
   }
 
   void ClearAcceleratorCalled() {
     on_accelerator_id_ = 0u;
     on_accelerator_called_ = false;
   }
 
   bool on_perform_move_loop_called() { return on_perform_move_loop_called_; }
   bool on_accelerator_called() { return on_accelerator_called_; }
   uint32_t on_accelerator_id() { return on_accelerator_id_; }
+  bool got_display_removed() const { return got_display_removed_; }
+  int64_t display_removed_id() const { return display_removed_id_; }
 
  private:
   // WindowManager:
   void OnConnect(uint16_t client_id) override {}
   void WmNewDisplayAdded(const display::Display& display,
                          ui::mojom::WindowDataPtr root,
                          bool drawn) override {}
+  void WmDisplayRemoved(int64_t display_id) 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 10 matching lines @@
                      std::unique_ptr<ui::Event> event) override;
 
   bool on_perform_move_loop_called_ = false;
 
   bool got_create_top_level_window_;
   uint32_t change_id_;
 
   bool on_accelerator_called_;
   uint32_t on_accelerator_id_;
 
+  bool got_display_removed_ = false;
+  int64_t display_removed_id_ = 0;
+
   DISALLOW_COPY_AND_ASSIGN(TestWindowManager);
 };
 
 // -----------------------------------------------------------------------------
 
 // WindowTreeClient implementation that logs all calls to a TestChangeTracker.
 class TestWindowTreeClient : public ui::mojom::WindowTreeClient {
  public:
   TestWindowTreeClient();
   ~TestWindowTreeClient() override;
@@ skipping 93 matching lines @@
 // -----------------------------------------------------------------------------
 
 // WindowTreeBinding implementation that vends TestWindowTreeBinding.
 class TestWindowTreeBinding : public WindowTreeBinding {
  public:
   explicit TestWindowTreeBinding(WindowTree* tree);
   ~TestWindowTreeBinding() override;
 
   WindowTree* tree() { return tree_; }
   TestWindowTreeClient* client() { return &client_; }
+  TestWindowManager* window_manager() { return window_manager_.get(); }
 
   bool is_paused() const { return is_paused_; }
 
   // WindowTreeBinding:
   mojom::WindowManager* GetWindowManager() override;
   void SetIncomingMethodCallProcessingPaused(bool paused) override;
 
  private:
   WindowTree* tree_;
   TestWindowTreeClient client_;
@@ skipping 142 matching lines @@
 
 // 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.
+// |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_