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

services/ui/ws/window_server_test_impl.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 "services/ui/ws/window_server_test_impl.h"
 
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/server_window.h"
-#include "services/ui/ws/server_window_surface_manager.h"
+#include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_tree.h"
 
 namespace ui {
 namespace ws {
 
 namespace {
 
 bool WindowHasValidFrame(const ServerWindow* window) {
-  const ServerWindowSurfaceManager* manager = window->surface_manager();
+  const ServerWindowCompositorFrameSinkManager* manager =
+      window->compositor_frame_sink_manager();
   return manager &&
-         !manager->GetDefaultSurface()->last_submitted_frame_size().IsEmpty();
+         !manager->GetDefaultCompositorFrameSink()
+              ->last_submitted_frame_size()
+              .IsEmpty();
 }
 
 }  // namespace
 
 WindowServerTestImpl::WindowServerTestImpl(WindowServer* window_server)
     : window_server_(window_server) {}
 
 WindowServerTestImpl::~WindowServerTestImpl() {}
 
 void WindowServerTestImpl::OnWindowPaint(
@@ skipping 23 matching lines @@
     }
   }
 
   window_server_->SetPaintCallback(
       base::Bind(&WindowServerTestImpl::OnWindowPaint, base::Unretained(this),
                  name, std::move(callback)));
 }
 
 }  // namespace ws
 }  // namespace ui