Adds remainder of support for multiple roots to WS

components/mus/public/cpp/tests/test_window_tree.h

 // Copyright 2015 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_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_H_
 #define COMPONENTS_MUS_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_H_
 
 #include <stdint.h>
 
 #include <set>
 
 #include "base/macros.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 
 namespace mus {
 
 // Testing WindowTree implementation.
 class TestWindowTree : public mojom::WindowTree {
  public:
   TestWindowTree();
   ~TestWindowTree() override;
 
   // Returns the most recent change_id supplied to one of the WindowTree
   // functions. Returns false if one of the WindowTree functions has not been
   // invoked since the last GetAndClearChangeId().
   bool GetAndClearChangeId(uint32_t* change_id);
 
+  uint32_t window_id() const { return window_id_; }
+
   bool WasEventAcked(uint32_t event_id) const;
 
  private:
   // mojom::WindowTree:
   void NewWindow(
       uint32_t change_id,
       uint32_t window_id,
       mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override;
+  void NewTopLevelWindow(
+      uint32_t change_id,
+      uint32_t window_id,
+      mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override;
   void DeleteWindow(uint32_t change_id, uint32_t window_id) override;
   void SetWindowBounds(uint32_t change_id,
                        uint32_t window_id,
                        mojo::RectPtr bounds) override;
   void SetClientArea(
       uint32_t window_id,
       mojo::InsetsPtr insets,
       mojo::Array<mojo::RectPtr> additional_client_areas) override;
   void SetWindowVisibility(uint32_t change_id,
                            uint32_t window_id,
@@ skipping 34 matching lines @@
                         bool visible,
                         mojo::TextInputStatePtr state) override;
   void OnWindowInputEventAck(uint32_t event_id) override;
   void GetWindowManagerInternalClient(
       mojo::AssociatedInterfaceRequest<mojom::WindowManagerInternalClient>
           internal) override;
 
   bool got_change_;
   uint32_t change_id_;
   std::set<uint32_t> acked_events_;
+  uint32_t window_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowTree);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_H_