services/ui: Match naming in cc (and jellyfish branch)

services/ui/ws/test_server_window_delegate.cc

Index: services/ui/ws/test_server_window_delegate.cc
diff --git a/services/ui/ws/test_server_window_delegate.cc b/services/ui/ws/test_server_window_delegate.cc
index f9296b3bbd19bf6621b8bf76ca6d5b61aebe8c70..873f074ff91d01c9b01e820f6bff539dc583fffb 100644
--- a/services/ui/ws/test_server_window_delegate.cc
+++ b/services/ui/ws/test_server_window_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "services/ui/surfaces/surfaces_state.h"
+#include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/test_server_window_delegate.h"
 
@@ -11,12 +11,12 @@ namespace ui {
 namespace ws {
 
 TestServerWindowDelegate::TestServerWindowDelegate()
-    : root_window_(nullptr), surfaces_state_(new SurfacesState()) {}
+    : root_window_(nullptr), display_compositor_(new DisplayCompositor()) {}
 
 TestServerWindowDelegate::~TestServerWindowDelegate() {}
 
-ui::SurfacesState* TestServerWindowDelegate::GetSurfacesState() {
-  return surfaces_state_.get();
+ui::DisplayCompositor* TestServerWindowDelegate::GetDisplayCompositor() {
+  return display_compositor_.get();
 }
 
 void TestServerWindowDelegate::OnScheduleWindowPaint(ServerWindow* window) {}