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

components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc

 // 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.
 
 #include "components/mus/public/cpp/lib/window_tree_client_impl.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 715 matching lines @@
   EXPECT_TRUE(setup.window_tree_connection()->GetRoots().count(root1) > 0u);
   EXPECT_TRUE(setup.window_tree_connection()->GetRoots().count(root2) > 0u);
 
   // Ack the request to the windowtree to create the new window.
   uint32_t change_id;
   ASSERT_TRUE(setup.window_tree()->GetAndClearChangeId(&change_id));
   EXPECT_EQ(setup.window_tree()->window_id(), server_id(root2));
 
   mojom::WindowDataPtr data = mojom::WindowData::New();
   data->window_id = server_id(root2);
-  data->display_id = 1;
+  const int64_t display_id = 1;
   setup.window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
-                                                false);
+                                                display_id, false);
 
   EXPECT_FALSE(WindowPrivate(root2).parent_drawn());
 
   // Should not be able to add a top level as a child of another window.
   root1->AddChild(root2);
   ASSERT_EQ(nullptr, root2->parent());
 
   // Destroy the first root, shouldn't initiate tear down.
   root1->Destroy();
   root1 = nullptr;
@@ skipping 11 matching lines @@
   EXPECT_FALSE(root2->IsDrawn());
   EXPECT_FALSE(root2->visible());
 
   // Ack the request to the windowtree to create the new window.
   uint32_t change_id;
   ASSERT_TRUE(setup.window_tree()->GetAndClearChangeId(&change_id));
   EXPECT_EQ(setup.window_tree()->window_id(), server_id(root2));
 
   mojom::WindowDataPtr data = mojom::WindowData::New();
   data->window_id = server_id(root2);
-  data->display_id = 1;
   data->bounds = mojo::Rect::From(gfx::Rect(1, 2, 3, 4));
   data->visible = true;
+  const int64_t display_id = 1;
   setup.window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
-                                                true);
+                                                display_id, true);
 
   // Make sure all the properties took.
   EXPECT_TRUE(root2->IsDrawn());
   EXPECT_TRUE(root2->visible());
   EXPECT_EQ(1, root2->display_id());
   EXPECT_EQ(gfx::Rect(1, 2, 3, 4), root2->bounds());
 }
 
 TEST_F(WindowTreeClientImplTest, NewTopLevelWindowGetsAllChangesInFlight) {
   WindowTreeSetup setup;
@@ skipping 33 matching lines @@
   root2->SetSharedProperty<std::string>("xx", "client_xx");
   uint32_t property_in_flight_change_id;
   ASSERT_TRUE(
       setup.window_tree()->GetAndClearChangeId(&property_in_flight_change_id));
   EXPECT_NE(bounds_in_flight_change_id, property_in_flight_change_id);
 
   // Ack the new window top level window. Vis and bounds shouldn't change.
   mojom::WindowDataPtr data = mojom::WindowData::New();
   data->window_id = server_id(root2);
   data->bounds = mojo::Rect::From(gfx::Rect(1, 2, 3, 4));
-  data->display_id = 1;
   data->visible = true;
   data->properties["xx"] = mojo::Array<uint8_t>::From(std::string("server_xx"));
   data->properties["yy"] = mojo::Array<uint8_t>::From(std::string("server_yy"));
-  setup.window_tree_client()->OnTopLevelCreated(new_window_in_flight_change_id,
-                                                std::move(data), true);
+  const int64_t display_id = 1;
+  setup.window_tree_client()->OnTopLevelCreated(
+      new_window_in_flight_change_id, std::move(data), display_id, true);
 
   // The only value that should take effect is the property for 'yy' as it was
   // not in flight.
   EXPECT_TRUE(WindowPrivate(root2).parent_drawn());
   EXPECT_FALSE(root2->visible());
   EXPECT_EQ(1, root2->display_id());
   EXPECT_EQ(gfx::Rect(5, 6, 7, 8), root2->bounds());
   EXPECT_EQ(2u, root2->shared_properties().size());
   ASSERT_TRUE(root2->HasSharedProperty("yy"));
   EXPECT_EQ("server_yy", root2->GetSharedProperty<std::string>("yy"));
@@ skipping 45 matching lines @@
   ASSERT_TRUE(root2);
   ASSERT_EQ(2u, setup.window_tree_connection()->GetRoots().size());
 
   // Get the id of the in flight change for creating the new window.
   uint32_t change_id;
   ASSERT_TRUE(setup.window_tree()->GetAndClearChangeId(&change_id));
   EXPECT_EQ(setup.window_tree()->window_id(), server_id(root2));
 
   mojom::WindowDataPtr data = mojom::WindowData::New();
   data->window_id = server_id(root2);
-  data->display_id = 1;
 
   // Destroy the window before the server has a chance to ack the window
   // creation.
   root2->Destroy();
   EXPECT_EQ(1u, setup.window_tree_connection()->GetRoots().size());
 
+  const int64_t display_id = 1;
   setup.window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
-                                                true);
+                                                display_id, true);
   EXPECT_EQ(1u, setup.window_tree_connection()->GetRoots().size());
 }
 
 // Tests both SetCapture and ReleaseCapture, to ensure that Window is properly
 // updated on failures.
 TEST_F(WindowTreeClientImplTest, ExplicitCapture) {
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
   ASSERT_TRUE(root);
 
@@ skipping 130 matching lines @@
 
   // Create a new Window, and attempt to place capture on that.
   Window* child = setup.window_tree_connection()->NewWindow();
   child->SetVisible(true);
   root->AddChild(child);
   child->SetCapture();
   EXPECT_TRUE(child->HasCapture());
 }
 
 }  // namespace mus