Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/ws/server_window_surface_manager.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 SERVICES_UI_WS_SERVER_WINDOW_SURFACE_MANAGER_H_
 #define SERVICES_UI_WS_SERVER_WINDOW_SURFACE_MANAGER_H_
 
 #include <map>
 
 #include "base/macros.h"
@@ skipping 15 matching lines @@
 class ServerWindowSurfaceManager {
  public:
   explicit ServerWindowSurfaceManager(ServerWindow* window);
   ~ServerWindowSurfaceManager();
 
   // Returns true if the surfaces from this manager should be drawn.
   bool ShouldDraw();
 
   // Creates a new surface of the specified type, replacing the existing one of
   // the specified type.
-  void CreateSurface(mojom::SurfaceType surface_type,
-                     mojo::InterfaceRequest<mojom::Surface> request,
-                     mojom::SurfaceClientPtr client);
+  void CreateSurface(
+      mojom::SurfaceType surface_type,
+      mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> request,
+      cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
   ServerWindow* window() { return window_; }
 
   ServerWindowSurface* GetDefaultSurface() const;
   ServerWindowSurface* GetUnderlaySurface() const;
   ServerWindowSurface* GetSurfaceByType(mojom::SurfaceType type) const;
   bool HasSurfaceOfType(mojom::SurfaceType type) const;
   bool HasAnySurface() const;
 
   cc::SurfaceManager* GetSurfaceManager();
@@ skipping 20 matching lines @@
   // the underlay is not necessarily as big as the window.
   bool waiting_for_initial_frames_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindowSurfaceManager);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_SERVER_WINDOW_SURFACE_MANAGER_H_