Remove dependency on SurfaceManager in FrameGenerator

services/ui/ws/window_tree.cc

 // Copyright 2014 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/window_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 1357 matching lines @@
                                     nullptr, std::move(compositor_frame_sink),
                                     std::move(client));
 }
 
 void WindowTree::OnWindowSurfaceDetached(Id transport_window_id,
                                          const cc::SurfaceSequence& sequence) {
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(transport_window_id));
   if (!window)
     return;
-  window_server_->GetDisplayCompositor()->ReturnSurfaceReference(sequence);
+  std::vector<uint32_t> sequences({sequence.sequence});
+  window_server_->GetDisplayCompositor()->ReturnSurfaceReferences(
+      sequence.frame_sink_id, std::move(sequences));
 }
 
 void WindowTree::SetWindowTextInputState(Id transport_window_id,
                                          mojo::TextInputStatePtr state) {
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(transport_window_id));
   bool success = window && access_policy_->CanSetWindowTextInputState(window);
   if (success)
     window->SetTextInputState(state.To<ui::TextInputState>());
 }
@@ skipping 556 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui