WIP: Surface Synchronization System

services/ui/ws/window_tree_client_unittest.cc

Index: services/ui/ws/window_tree_client_unittest.cc
diff --git a/services/ui/ws/window_tree_client_unittest.cc b/services/ui/ws/window_tree_client_unittest.cc
index e06fefb47b684fb081aec31c806294ee7404e31b..530b19c208fae97430a79af125b9c53531b82474 100644
--- a/services/ui/ws/window_tree_client_unittest.cc
+++ b/services/ui/ws/window_tree_client_unittest.cc
@@ -221,7 +221,7 @@ class TestWindowTreeClient : public mojom::WindowTreeClient,
   Id NewWindowWithCompleteId(Id id) {
     std::unordered_map<std::string, std::vector<uint8_t>> properties;
     const uint32_t change_id = GetAndAdvanceChangeId();
-    tree()->NewWindow(change_id, id, std::move(properties));
+    tree()->NewWindow(change_id, id, std::move(properties), cc::LocalFrameId());
     return WaitForChangeCompleted(change_id) ? id : 0;
   }
 
@@ -304,7 +304,8 @@ class TestWindowTreeClient : public mojom::WindowTreeClient,
   }
   void OnWindowBoundsChanged(Id window_id,
                              const gfx::Rect& old_bounds,
-                             const gfx::Rect& new_bounds) override {
+                             const gfx::Rect& new_bounds,
+                             const cc::LocalFrameId& local_frame_id) override {
     // The bounds of the root may change during startup on Android at random
     // times. As this doesn't matter, and shouldn't impact test exepctations,
     // it is ignored.
@@ -447,7 +448,8 @@ class TestWindowTreeClient : public mojom::WindowTreeClient,
   }
   void WmSetBounds(uint32_t change_id,
                    uint32_t window_id,
-                   const gfx::Rect& bounds) override {
+                   const gfx::Rect& bounds,
+                   const cc::LocalFrameId& local_frame_id) override {
     window_manager_client_->WmResponse(change_id, false);
   }
   void WmSetProperty(
@@ -1315,7 +1317,8 @@ TEST_F(WindowTreeClientTest, SetWindowBounds) {
 
   wt_client2_->set_track_root_bounds_changes(true);
 
-  wt1()->SetWindowBounds(10, window_1_1, gfx::Rect(0, 0, 100, 100));
+  wt1()->SetWindowBounds(10, window_1_1, gfx::Rect(0, 0, 100, 100),
+                         cc::LocalFrameId());
   ASSERT_TRUE(wt_client1()->WaitForChangeCompleted(10));
 
   wt_client2_->WaitForChangeCount(1);
@@ -1325,7 +1328,8 @@ TEST_F(WindowTreeClientTest, SetWindowBounds) {
 
   // Should not be possible to change the bounds of a window created by another
   // client.
-  wt2()->SetWindowBounds(11, window_1_1, gfx::Rect(0, 0, 0, 0));
+  wt2()->SetWindowBounds(11, window_1_1, gfx::Rect(0, 0, 0, 0),
+                         cc::LocalFrameId());
   ASSERT_FALSE(wt_client2()->WaitForChangeCompleted(11));
 }
 
@@ -2062,7 +2066,8 @@ TEST_F(WindowTreeClientTest, Ids) {
   changes1()->clear();
 
   // Change the bounds of window_2_101 and make sure server gets it.
-  wt2()->SetWindowBounds(11, window_2_101, gfx::Rect(1, 2, 3, 4));
+  wt2()->SetWindowBounds(11, window_2_101, gfx::Rect(1, 2, 3, 4),
+                         cc::LocalFrameId());
   ASSERT_TRUE(wt_client2()->WaitForChangeCompleted(11));
   wt_client1()->WaitForChangeCount(1);
   EXPECT_EQ("BoundsChanged window=" + IdToString(window_2_101_in_ws1) +