Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/ws/server_window_surface_manager.cc

 // 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.
 
 #include "services/ui/ws/server_window_surface_manager.h"
 
 #include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_delegate.h"
@@ skipping 20 matching lines @@
     return true;
 
   waiting_for_initial_frames_ =
       !IsSurfaceReadyAndNonEmpty(mojom::SurfaceType::DEFAULT) ||
       !IsSurfaceReadyAndNonEmpty(mojom::SurfaceType::UNDERLAY);
   return !waiting_for_initial_frames_;
 }
 
 void ServerWindowSurfaceManager::CreateSurface(
     mojom::SurfaceType surface_type,
-    mojo::InterfaceRequest<mojom::Surface> request,
-    mojom::SurfaceClientPtr client) {
+    mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> request,
+    cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   cc::FrameSinkId frame_sink_id(WindowIdToTransportId(window_->id()),
                                 static_cast<uint32_t>(surface_type));
   std::unique_ptr<ServerWindowSurface> surface(new ServerWindowSurface(
       this, frame_sink_id, std::move(request), std::move(client)));
   type_to_surface_map_[surface_type] = std::move(surface);
 }
 
 ServerWindowSurface* ServerWindowSurfaceManager::GetDefaultSurface() const {
   return GetSurfaceByType(mojom::SurfaceType::DEFAULT);
 }
@@ skipping 29 matching lines @@
   if (iter->second->last_submitted_frame_size().IsEmpty())
     return false;
   const gfx::Size& last_submitted_frame_size =
       iter->second->last_submitted_frame_size();
   return last_submitted_frame_size.width() >= window_->bounds().width() &&
          last_submitted_frame_size.height() >= window_->bounds().height();
 }
 
 }  // namespace ws
 }  // namespace ui