Mus-WS / Aura-Mus: Propagate LocalSurfaceId on WindowTreeHost creation

ui/aura/mus/window_tree_client_unittest.cc

Index: ui/aura/mus/window_tree_client_unittest.cc
diff --git a/ui/aura/mus/window_tree_client_unittest.cc b/ui/aura/mus/window_tree_client_unittest.cc
index b31de250eb2a5e6d4a98eabb71210f32cdbe7620..9a1d141131dd2e34967dcdbc53ec4b203e342fa4 100644
--- a/ui/aura/mus/window_tree_client_unittest.cc
+++ b/ui/aura/mus/window_tree_client_unittest.cc
@@ -1083,8 +1083,9 @@ TEST_F(WindowTreeClientClientTest, NewTopLevelWindow) {
   ui::mojom::WindowDataPtr data = ui::mojom::WindowData::New();
   data->window_id = server_id(top_level);
   const int64_t display_id = 1;
-  window_tree_client()->OnTopLevelCreated(
-      change_id, std::move(data), display_id, false, cc::FrameSinkId(1, 1));
+  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                          display_id, false,
+                                          cc::FrameSinkId(1, 1), base::nullopt);
 
   EXPECT_FALSE(window_tree_host->window()->TargetVisibility());
 
@@ -1123,8 +1124,9 @@ TEST_F(WindowTreeClientClientTest, NewTopLevelWindowGetsPropertiesFromData) {
   uint32_t change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
-  window_tree_client()->OnTopLevelCreated(
-      change_id, std::move(data), display_id, true, cc::FrameSinkId(1, 1));
+  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                          display_id, true,
+                                          cc::FrameSinkId(1, 1), base::nullopt);
   EXPECT_EQ(
       0u, window_tree()->GetChangeCountForType(WindowTreeChangeType::VISIBLE));
 
@@ -1176,7 +1178,7 @@ TEST_F(WindowTreeClientClientTest, NewWindowGetsAllChangesInFlight) {
       WindowTreeChangeType::NEW_TOP_LEVEL, &new_window_in_flight_change_id));
   window_tree_client()->OnTopLevelCreated(new_window_in_flight_change_id,
                                           std::move(data), display_id, true,
-                                          cc::FrameSinkId(1, 1));
+                                          cc::FrameSinkId(1, 1), base::nullopt);
 
   // The only value that should take effect is the property for 'yy' as it was
   // not in flight.
@@ -1398,8 +1400,9 @@ TEST_F(WindowTreeClientClientTest,
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
 
   const int64_t display_id = 1;
-  window_tree_client()->OnTopLevelCreated(
-      change_id, std::move(data), display_id, true, cc::FrameSinkId(1, 1));
+  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                          display_id, true,
+                                          cc::FrameSinkId(1, 1), base::nullopt);
   EXPECT_EQ(initial_root_count, window_tree_client_impl()->GetRoots().size());
 }
 
@@ -1703,8 +1706,9 @@ TEST_F(WindowTreeClientClientTest, TwoWindowTreesRequestCapture) {
   data->window_id = server_id(top_level);
   data->visible = true;
   const int64_t display_id = 1;
-  window_tree_client()->OnTopLevelCreated(
-      change_id, std::move(data), display_id, true, cc::FrameSinkId(1, 1));
+  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                          display_id, true,
+                                          cc::FrameSinkId(1, 1), base::nullopt);
   EXPECT_EQ(
       0u, window_tree()->GetChangeCountForType(WindowTreeChangeType::VISIBLE));
   EXPECT_TRUE(top_level->TargetVisibility());
@@ -1912,8 +1916,9 @@ TEST_F(WindowTreeClientClientTestHighDPI, NewTopLevelWindowBounds) {
   uint32_t change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
-  window_tree_client()->OnTopLevelCreated(
-      change_id, std::move(data), display_id, true, cc::FrameSinkId(1, 1));
+  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                          display_id, true,
+                                          cc::FrameSinkId(1, 1), base::nullopt);
 
   // aura::Window should operate in DIP and aura::WindowTreeHost should operate
   // in pixels.