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

content/renderer/mus/render_widget_mus_connection.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_
 #define CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/compositor_frame_sink.h"
 #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;
 }
 
 namespace content {
 
 class InputHandlerManager;
 
 // Use on main thread.
@@ skipping 37 matching lines @@
   bool WillHandleGestureEvent(const blink::WebGestureEvent& event) override;
   bool WillHandleMouseEvent(const blink::WebMouseEvent& event) override;
 
   void OnConnectionLost();
   void OnWindowInputEvent(
       ui::ScopedWebInputEvent input_event,
       const base::Callback<void(ui::mojom::EventResult)>& ack);
 
   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_;
 
   // Used to verify single threaded access.
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetMusConnection);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_