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

components/mus/ws/test_utils.cc

 // 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.
 
 #include "components/mus/ws/test_utils.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/display_binding.h"
@@ skipping 164 matching lines @@
 TestWindowTreeClient::~TestWindowTreeClient() {}
 
 void TestWindowTreeClient::Bind(
     mojo::InterfaceRequest<mojom::WindowTreeClient> request) {
   binding_.Bind(std::move(request));
 }
 
 void TestWindowTreeClient::OnEmbed(uint16_t client_id,
                                    mojom::WindowDataPtr root,
                                    mus::mojom::WindowTreePtr tree,
+                                   int64_t display_id,
                                    Id focused_window_id,
                                    bool drawn) {
   // TODO(sky): add test coverage of |focused_window_id|.
   tracker_.OnEmbed(client_id, std::move(root), drawn);
 }
 
 void TestWindowTreeClient::OnEmbeddedAppDisconnected(uint32_t window) {
   tracker_.OnEmbeddedAppDisconnected(window);
 }
 
 void TestWindowTreeClient::OnUnembed(Id window_id) {
   tracker_.OnUnembed(window_id);
 }
 
 void TestWindowTreeClient::OnLostCapture(Id window_id) {}
 
 void TestWindowTreeClient::OnTopLevelCreated(uint32_t change_id,
                                              mojom::WindowDataPtr data,
+                                             int64_t display_id,
                                              bool drawn) {
   tracker_.OnTopLevelCreated(change_id, std::move(data), drawn);
 }
 
 void TestWindowTreeClient::OnWindowBoundsChanged(uint32_t window,
                                                  mojo::RectPtr old_bounds,
                                                  mojo::RectPtr new_bounds) {
   tracker_.OnWindowBoundsChanged(window, std::move(old_bounds),
                                  std::move(new_bounds));
 }
@@ skipping 272 matching lines @@
     return nullptr;
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus