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

services/ui/ws/window_finder_unittest.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/window_finder.h"
 
 #include "services/ui/ws/server_window.h"
-#include "services/ui/ws/server_window_surface_manager.h"
-#include "services/ui/ws/server_window_surface_manager_test_api.h"
+#include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
+#include "services/ui/ws/server_window_compositor_frame_sink_manager_test_api.h"
 #include "services/ui/ws/test_server_window_delegate.h"
 #include "services/ui/ws/window_finder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 namespace ws {
 
 TEST(WindowFinderTest, FindDeepestVisibleWindow) {
   TestServerWindowDelegate window_delegate;
   ServerWindow root(&window_delegate, WindowId(1, 2));
@@ skipping 55 matching lines @@
 
   // Test a point inside the window and inside the mask.
   gfx::Point point_inside_mask(15, 15);
   EXPECT_EQ(&child_with_mask,
             FindDeepestVisibleWindowForEvents(&root, &point_inside_mask));
   EXPECT_EQ(gfx::Point(5, 5), point_inside_mask);
 }
 
 }  // namespace ws
 }  // namespace ui