Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink

content/renderer/mus/render_widget_mus_connection.h

Index: content/renderer/mus/render_widget_mus_connection.h
diff --git a/content/renderer/mus/render_widget_mus_connection.h b/content/renderer/mus/render_widget_mus_connection.h
index 80a3526b863f3a36c3dccb052b1f5814dde2a093..3b8576a98a6cea27b6bbabfd11fb933d8dd42285 100644
--- a/content/renderer/mus/render_widget_mus_connection.h
+++ b/content/renderer/mus/render_widget_mus_connection.h
@@ -11,7 +11,6 @@
 #include "content/common/content_export.h"
 #include "content/renderer/input/render_widget_input_handler_delegate.h"
 #include "content/renderer/mus/compositor_mus_connection.h"
-#include "services/ui/public/cpp/window_surface.h"
 
 namespace gpu {
 class GpuChannelHost;
@@ -69,7 +68,8 @@ class CONTENT_EXPORT RenderWidgetMusConnection
 
   const int routing_id_;
   RenderWidgetInputHandler* input_handler_;
-  std::unique_ptr<ui::WindowSurfaceBinding> window_surface_binding_;
+  std::unique_ptr<ui::WindowCompositorFrameSinkBinding>
+      window_compositor_frame_sink_binding_;
   scoped_refptr<CompositorMusConnection> compositor_mus_connection_;
 
   base::Callback<void(ui::mojom::EventResult)> pending_ack_;