Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/public/cpp/window_tree_client.cc

 // Copyright 2014 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/public/cpp/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 334 matching lines @@
 }
 
 void WindowTreeClient::RequestClose(Window* window) {
   if (window_manager_internal_client_)
     window_manager_internal_client_->WmRequestClose(server_id(window));
 }
 
 void WindowTreeClient::AttachSurface(
     Id window_id,
     mojom::SurfaceType type,
-    mojo::InterfaceRequest<mojom::Surface> surface,
-    mojom::SurfaceClientPtr client) {
+    mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
+    cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   DCHECK(tree_);
   tree_->AttachSurface(window_id, type, std::move(surface), std::move(client));
 }
 
 void WindowTreeClient::OnWindowSurfaceDetached(
     Id window_id,
     const cc::SurfaceSequence& sequence) {
   DCHECK(tree_);
   tree_->OnWindowSurfaceDetached(window_id, sequence);
 }
@@ skipping 1065 matching lines @@
     Window* window,
     const gfx::Vector2d& offset,
     const gfx::Insets& hit_area) {
   if (window_manager_internal_client_) {
     window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
         server_id(window), offset.x(), offset.y(), hit_area);
   }
 }
 
 }  // namespace ui