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

services/ui/ws/cursor_unittest.cc

 // Copyright 2016 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 <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "services/ui/common/types.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/platform_display_factory.h"
 #include "services/ui/ws/server_window.h"
-#include "services/ui/ws/server_window_surface_manager_test_api.h"
+#include "services/ui/ws/server_window_compositor_frame_sink_manager_test_api.h"
 #include "services/ui/ws/test_utils.h"
 #include "services/ui/ws/window_manager_display_root.h"
 #include "services/ui/ws/window_manager_state.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_server_delegate.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 45 matching lines @@
         active_display_root->window_manager_state()->window_tree();
     ClientWindowId child_window_id;
     if (!NewWindowInTree(tree, &child_window_id))
       return nullptr;
 
     ServerWindow* w = tree->GetWindowByClientId(child_window_id);
     w->SetBounds(gfx::Rect(10, 10, 30, 30));
     w->SetClientArea(gfx::Insets(10, 10), std::vector<gfx::Rect>());
     w->SetVisible(true);
 
-    ServerWindowSurfaceManagerTestApi test_api(w->GetOrCreateSurfaceManager());
-    test_api.CreateEmptyDefaultSurface();
+    ServerWindowCompositorFrameSinkManagerTestApi test_api(
+        w->GetOrCreateCompositorFrameSinkManager());
+    test_api.CreateEmptyDefaultCompositorFrameSink();
 
     return w;
   }
 
   void MoveCursorTo(const gfx::Point& p) {
     DisplayManager* display_manager = window_server()->display_manager();
     ASSERT_EQ(1u, display_manager->displays().size());
     Display* display = *display_manager->displays().begin();
     WindowManagerDisplayRoot* active_display_root =
         display->GetActiveWindowManagerDisplayRoot();
@@ skipping 80 matching lines @@
   MoveCursorTo(gfx::Point(15, 15));
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
   win->SetBounds(gfx::Rect(0, 0, 30, 30));
   EXPECT_EQ(mojom::Cursor::IBEAM, cursor());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui