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

services/ui/public/cpp/tests/test_window_tree.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_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_H_
 #define SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_H_
 
 #include <stdint.h>
 
 #include <set>
@@ skipping 41 matching lines @@
   void SetWindowVisibility(uint32_t change_id,
                            uint32_t window_id,
                            bool visible) override;
   void SetWindowProperty(uint32_t change_id,
                          uint32_t window_id,
                          const mojo::String& name,
                          mojo::Array<uint8_t> value) override;
   void SetWindowOpacity(uint32_t change_id,
                         uint32_t window_id,
                         float opacity) override;
-  void AttachSurface(
+  void AttachCompositorFrameSink(
       uint32_t window_id,
-      mojom::SurfaceType type,
+      mojom::CompositorFrameSinkType type,
       mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
       cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
   void AddWindow(uint32_t change_id, uint32_t parent, uint32_t child) override;
   void RemoveWindowFromParent(uint32_t change_id, uint32_t window_id) override;
   void AddTransientWindow(uint32_t change_id,
                           uint32_t window_id,
                           uint32_t transient_window_id) override;
   void RemoveTransientWindowFromParent(uint32_t change_id,
                                        uint32_t window_id) override;
   void SetModal(uint32_t change_id, uint32_t window_id) override;
@@ skipping 46 matching lines @@
   uint32_t change_id_;
   std::set<uint32_t> acked_events_;
   uint32_t window_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowTree);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_H_