Mus: Remove dependency on ServerWindowCompositorFrameSink from 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 757 matching lines @@
   ServerWindow* parent_window = window->parent();
   ClientWindowId client_window_id, parent_client_window_id;
   if (!IsWindowKnown(window, &client_window_id) ||
       !IsWindowKnown(parent_window, &parent_client_window_id) ||
       !created_window_map_.count(parent_window->id())) {
     return;
   }
 
   ServerWindowCompositorFrameSinkManager* compositor_frame_sink_manager =
       window->GetOrCreateCompositorFrameSinkManager();
-  ServerWindowCompositorFrameSink* compositor_frame_sink =
-      compositor_frame_sink_manager->GetDefaultCompositorFrameSink();
-  cc::SurfaceSequence sequence = compositor_frame_sink->CreateSurfaceSequence();
+  cc::SurfaceSequence sequence =
+      compositor_frame_sink_manager->CreateSurfaceSequence(
+          mojom::CompositorFrameSinkType::DEFAULT);
   client()->OnWindowSurfaceChanged(client_window_id.id, surface_id, sequence,
                                    frame_size, device_scale_factor);
 }
 
 void WindowTree::SendToPointerWatcher(const ui::Event& event,
                                       ServerWindow* target_window) {
   if (!EventMatchesPointerWatcher(event))
     return;
 
   ClientWindowId client_window_id;
@@ skipping 1153 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui