Enables passing initial properties to top level window creation

ui/aura/mus/window_tree_client_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 "ui/aura/mus/window_tree_client.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 886 matching lines @@
   uint32_t change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
 
   const int64_t display_id = 1;
   window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
                                           display_id, true);
   EXPECT_EQ(initial_root_count, window_tree_client_impl()->GetRoots().size());
 }
 
+TEST_F(WindowTreeClientClientTest, NewTopLevelWindowGetsProperties) {
+  const uint8_t property_value = 11;
+  SetPropertyConverter(base::MakeUnique<TestPropertyConverter>());
+  std::map<std::string, std::vector<uint8_t>> properties;
+  properties[kTestPropertyServerKey1].resize(1);
+  properties[kTestPropertyServerKey1][0] = property_value;
+  std::unique_ptr<WindowTreeHostMus> window_tree_host =
+      base::MakeUnique<WindowTreeHostMus>(window_tree_client_impl(),
+                                          &properties);
+  // Verify the property made it to the window.
+  EXPECT_EQ(property_value,
+            window_tree_host->window()->GetProperty(kTestPropertyKey1));
+
+  // Get the id of the in flight change for creating the new top level window.
+  uint32_t change_id;
+  ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
+      WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
+
+  // Verify the property was sent to the server.
+  mojo::Map<mojo::String, mojo::Array<uint8_t>> transport_properties =
+      window_tree()->GetLastNewWindowProperties();
+  ASSERT_FALSE(transport_properties.is_null());
+  std::map<std::string, std::vector<uint8_t>> properties2 =
+      transport_properties.To<std::map<std::string, std::vector<uint8_t>>>();
+  ASSERT_EQ(1u, properties2.count(kTestPropertyServerKey1));
+  ASSERT_EQ(1u, properties2[kTestPropertyServerKey1].size());
+  EXPECT_EQ(property_value, properties2[kTestPropertyServerKey1][0]);
+}
+
 // Tests both SetCapture and ReleaseCapture, to ensure that Window is properly
 // updated on failures.
 TEST_F(WindowTreeClientWmTest, ExplicitCapture) {
   root_window()->SetCapture();
   EXPECT_TRUE(root_window()->HasCapture());
   ASSERT_TRUE(window_tree()->AckSingleChangeOfType(
       WindowTreeChangeType::CAPTURE, false));
   EXPECT_FALSE(root_window()->HasCapture());
 
   root_window()->SetCapture();
@@ skipping 242 matching lines @@
   ASSERT_EQ(1u, root_window()->children().size());
   Window* server_window = root_window()->children()[0];
   EXPECT_EQ(window1->parent(), server_window);
   EXPECT_EQ(window2->parent(), server_window);
   ASSERT_EQ(2u, server_window->children().size());
   EXPECT_EQ(window1, server_window->children()[0]);
   EXPECT_EQ(window2, server_window->children()[1]);
 }
 
 }  // namespace aura