[DONT COMMIT] Revert of Mus: ws/ should not depend on surfaces/

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 8d63b62242812ea25f791afbe3de47e7467718bf..8feecc3dc79d478b531bdacabab7dca853ed321c 100644
--- a/services/ui/ws/test_server_window_delegate.h
+++ b/services/ui/ws/test_server_window_delegate.h
@@ -6,13 +6,8 @@
 #define SERVICES_UI_WS_TEST_SERVER_WINDOW_DELEGATE_H_
 
 #include "base/macros.h"
+#include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/server_window_delegate.h"
-
-namespace cc {
-namespace mojom {
-class DisplayCompositor;
-}
-}
 
 namespace ui {
 
@@ -33,6 +28,7 @@
   ServerWindow* GetRootWindow(const ServerWindow* window) override;
 
   ServerWindow* root_window_;
+  std::unique_ptr<ui::DisplayCompositor> display_compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(TestServerWindowDelegate);
 };