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

components/mus/public/cpp/tests/window_tree_client_impl_private.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/public/cpp/tests/window_tree_client_impl_private.h"
 
 #include "components/mus/public/cpp/lib/window_tree_client_impl.h"
 #include "components/mus/public/cpp/window.h"
 #include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
@@ skipping 13 matching lines @@
   return tree_client_impl_->event_observer_id_;
 }
 
 void WindowTreeClientImplPrivate::OnEmbed(mojom::WindowTree* window_tree) {
   mojom::WindowDataPtr root_data(mojom::WindowData::New());
   root_data->parent_id = 0;
   root_data->window_id = 1;
   root_data->bounds = mojo::Rect::From(gfx::Rect());
   root_data->properties.SetToEmpty();
   root_data->visible = true;
-  root_data->display_id = 1;
-  tree_client_impl_->OnEmbedImpl(window_tree, 1, std::move(root_data), 0, true);
+  const int64_t display_id = 1;
+  const Id focused_window_id = 0;
+  tree_client_impl_->OnEmbedImpl(window_tree, 1, std::move(root_data),
+                                 display_id, focused_window_id, true);
 }
 
 void WindowTreeClientImplPrivate::CallOnWindowInputEvent(
     Window* window,
     const ui::Event& event) {
   const uint32_t event_id = 0u;
   const uint32_t observer_id = 0u;
   tree_client_impl_->OnWindowInputEvent(event_id, window->server_id(),
                                         mojom::Event::From(event), observer_id);
 }
 
 }  // namespace mus