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

services/ui/ws/window_server.cc

Index: services/ui/ws/window_server.cc
diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
index 1a878b9e82e868888fcc0feb71e5bda6249237b8..0cc75afee9360603bd539d05a91e33e9086efdbc 100644
--- a/services/ui/ws/window_server.cc
+++ b/services/ui/ws/window_server.cc
@@ -46,7 +46,7 @@ struct WindowServer::CurrentDragLoopState {
 
 WindowServer::WindowServer(WindowServerDelegate* delegate)
     : delegate_(delegate),
-      surfaces_state_(new SurfacesState()),
+      display_compositor_(new DisplayCompositor()),
       next_client_id_(1),
       display_manager_(new DisplayManager(this, &user_id_tracker_)),
       current_operation_(nullptr),
@@ -529,8 +529,8 @@ WindowManagerState* WindowServer::GetWindowManagerStateForUser(
       user_id);
 }
 
-ui::SurfacesState* WindowServer::GetSurfacesState() {
-  return surfaces_state_.get();
+ui::DisplayCompositor* WindowServer::GetDisplayCompositor() {
+  return display_compositor_.get();
 }
 
 bool WindowServer::GetFrameDecorationsForUser(