mus: Send display-id to client only for the root windows.

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>
@@ skipping 259 matching lines @@
 
   void set_record_on_change_completed(bool value) {
     record_on_change_completed_ = value;
   }
 
  private:
   // WindowTreeClient:
   void OnEmbed(uint16_t client_id,
                mojom::WindowDataPtr root,
                mus::mojom::WindowTreePtr tree,
+               int64_t display_id,
                Id focused_window_id,
                bool drawn) override;
   void OnEmbeddedAppDisconnected(uint32_t window) override;
   void OnUnembed(Id window_id) override;
   void OnLostCapture(Id window_id) override;
   void OnTopLevelCreated(uint32_t change_id,
                          mojom::WindowDataPtr data,
+                         int64_t display_id,
                          bool drawn) override;
   void OnWindowBoundsChanged(uint32_t window,
                              mojo::RectPtr old_bounds,
                              mojo::RectPtr new_bounds) override;
   void OnClientAreaChanged(
       uint32_t window_id,
       mojo::InsetsPtr new_client_area,
       mojo::Array<mojo::RectPtr> new_additional_client_areas) override;
   void OnTransientWindowAdded(uint32_t window_id,
                               uint32_t transient_window_id) override;
@@ skipping 202 matching lines @@
 
 // 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);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_TEST_UTILS_H_