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

content/renderer/mus/compositor_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_COMPOSITOR_MUS_CONNECTION_H_
 #define CONTENT_RENDERER_MUS_COMPOSITOR_MUS_CONNECTION_H_
 
 #include <memory>
 
 #include "base/bind.h"
@@ skipping 30 matching lines @@
       public base::RefCountedThreadSafe<CompositorMusConnection> {
  public:
   // Created on main thread.
   CompositorMusConnection(
       int routing_id,
       const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
       const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
       mojo::InterfaceRequest<ui::mojom::WindowTreeClient> request,
       InputHandlerManager* input_handler_manager);
 
-  // Attaches the provided |surface_binding| with the ui::Window for the
-  // renderer once it becomes available.
+  // Attaches the provided |compositor_frame_sink_binding| with the ui::Window
+  // for the renderer once it becomes available.
   void AttachCompositorFrameSinkOnMainThread(
-      std::unique_ptr<ui::WindowSurfaceBinding> surface_binding);
+      std::unique_ptr<ui::WindowCompositorFrameSinkBinding>
+          compositor_frame_sink_binding);
 
  private:
   friend class CompositorMusConnectionTest;
   friend class base::RefCountedThreadSafe<CompositorMusConnection>;
 
   ~CompositorMusConnection() override;
 
   void AttachCompositorFrameSinkOnCompositorThread(
-      std::unique_ptr<ui::WindowSurfaceBinding> surface_binding);
+      std::unique_ptr<ui::WindowCompositorFrameSinkBinding>
+          compositor_frame_sink_binding);
 
   void CreateWindowTreeClientOnCompositorThread(
       ui::mojom::WindowTreeClientRequest request);
 
   void OnConnectionLostOnMainThread();
 
   void OnWindowInputEventOnMainThread(
       ui::ScopedWebInputEvent web_event,
       const base::Callback<void(ui::mojom::EventResult)>& ack);
 
@@ skipping 28 matching lines @@
 
   const int routing_id_;
   // Use this lock when accessing |window_tree_client_|. Lock exists solely for
   // DCHECK in destructor.
   base::Lock window_tree_client_lock_;
   std::unique_ptr<ui::WindowTreeClient> window_tree_client_;
   ui::Window* root_;
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
   InputHandlerManager* const input_handler_manager_;
-  std::unique_ptr<ui::WindowSurfaceBinding> window_surface_binding_;
+  std::unique_ptr<ui::WindowCompositorFrameSinkBinding>
+      window_compositor_frame_sink_binding_;
 
   // Stores the current state of the active pointers targeting this object.
   ui::MotionEventAura pointer_state_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorMusConnection);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MUS_COMPOSITOR_MUS_CONNECTION_H_