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

services/ui/public/cpp/tests/test_window_tree.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/public/cpp/tests/test_window_tree.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 
@@ skipping 65 matching lines @@
   change_id_ = change_id;
 }
 
 void TestWindowTree::SetWindowOpacity(uint32_t change_id,
                                       uint32_t window_id,
                                       float opacity) {
   got_change_ = true;
   change_id_ = change_id;
 }
 
-void TestWindowTree::AttachSurface(
+void TestWindowTree::AttachCompositorFrameSink(
     uint32_t window_id,
-    mojom::SurfaceType type,
+    mojom::CompositorFrameSinkType type,
     mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {}
 
 void TestWindowTree::AddWindow(uint32_t change_id,
                                uint32_t parent,
                                uint32_t child) {}
 
 void TestWindowTree::RemoveWindowFromParent(uint32_t change_id,
                                             uint32_t window_id) {}
 
@@ skipping 85 matching lines @@
                                        mojom::MoveLoopSource source,
                                        const gfx::Point& cursor_location) {}
 
 void TestWindowTree::CancelWindowMove(uint32_t window_id) {}
 
 void TestWindowTree::OnWindowSurfaceDetached(
     uint32_t window_id,
     const cc::SurfaceSequence& sequence) {}
 
 }  // namespace ui