Only send the FrameSinkId to client when it is necessary

services/ui/ws/test_utils.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 "services/ui/ws/test_utils.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 208 matching lines @@
 TestWindowManager::~TestWindowManager() {}
 
 void TestWindowManager::OnConnect(uint16_t client_id) {
   connect_count_++;
 }
 
 void TestWindowManager::WmNewDisplayAdded(
     const display::Display& display,
     ui::mojom::WindowDataPtr root,
     bool drawn,
-    const cc::FrameSinkId& frame_sink_id,
     const base::Optional<cc::LocalSurfaceId>& local_surface_id) {
   display_added_count_++;
 }
 
 void TestWindowManager::WmDisplayRemoved(int64_t display_id) {
   got_display_removed_ = true;
   display_removed_id_ = display_id;
 }
 
 void TestWindowManager::WmSetModalType(uint32_t window_id, ui::ModalType type) {
@@ skipping 59 matching lines @@
   binding_.Bind(std::move(request));
 }
 
 void TestWindowTreeClient::OnEmbed(
     uint16_t client_id,
     mojom::WindowDataPtr root,
     ui::mojom::WindowTreePtr tree,
     int64_t display_id,
     Id focused_window_id,
     bool drawn,
-    const cc::FrameSinkId& frame_sink_id,
     const base::Optional<cc::LocalSurfaceId>& local_surface_id) {
   // TODO(sky): add test coverage of |focused_window_id|.
-  tracker_.OnEmbed(client_id, std::move(root), drawn, frame_sink_id);
+  tracker_.OnEmbed(client_id, std::move(root), drawn);
 }
 
 void TestWindowTreeClient::OnEmbeddedAppDisconnected(uint32_t window) {
   tracker_.OnEmbeddedAppDisconnected(window);
 }
 
 void TestWindowTreeClient::OnUnembed(Id window_id) {
   tracker_.OnUnembed(window_id);
 }
 
 void TestWindowTreeClient::OnCaptureChanged(Id new_capture_window_id,
                                             Id old_capture_window_id) {
   tracker_.OnCaptureChanged(new_capture_window_id, old_capture_window_id);
 }
 
 void TestWindowTreeClient::OnFrameSinkIdAllocated(
     Id window_id,
     const cc::FrameSinkId& frame_sink_id) {
   tracker_.OnFrameSinkIdAllocated(window_id, frame_sink_id);
 }
 
 void TestWindowTreeClient::OnTopLevelCreated(
     uint32_t change_id,
     mojom::WindowDataPtr data,
     int64_t display_id,
     bool drawn,
-    const cc::FrameSinkId& frame_sink_id,
     const base::Optional<cc::LocalSurfaceId>& local_surface_id) {
-  tracker_.OnTopLevelCreated(change_id, std::move(data), drawn, frame_sink_id);
+  tracker_.OnTopLevelCreated(change_id, std::move(data), drawn);
 }
 
 void TestWindowTreeClient::OnWindowBoundsChanged(
     uint32_t window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds,
     const base::Optional<cc::LocalSurfaceId>& local_surface_id) {
   tracker_.OnWindowBoundsChanged(window, std::move(old_bounds),
                                  std::move(new_bounds), local_surface_id);
 }
@@ skipping 336 matching lines @@
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   if (client_id)
     *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui