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

services/ui/ws/test_server_window_delegate.h

Index: services/ui/ws/test_server_window_delegate.h
diff --git a/services/ui/ws/test_server_window_delegate.h b/services/ui/ws/test_server_window_delegate.h
index 9fd4c2cdb6ec17e1ea2fa1578c2e1113e66be6cb..67c50c51851f7879765f8fb9f059b2405954422b 100644
--- a/services/ui/ws/test_server_window_delegate.h
+++ b/services/ui/ws/test_server_window_delegate.h
@@ -23,13 +23,13 @@ class TestServerWindowDelegate : public ServerWindowDelegate {
 
  private:
   // ServerWindowDelegate:
-  ui::SurfacesState* GetSurfacesState() override;
+  ui::DisplayCompositor* GetDisplayCompositor() override;
   void OnScheduleWindowPaint(ServerWindow* window) override;
   const ServerWindow* GetRootWindow(const ServerWindow* window) const override;
   void ScheduleSurfaceDestruction(ServerWindow* window) override;
 
   const ServerWindow* root_window_;
-  scoped_refptr<ui::SurfacesState> surfaces_state_;
+  scoped_refptr<ui::DisplayCompositor> display_compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(TestServerWindowDelegate);
 };