services/ui: Revert CLs that broke Windows.

services/ui/surfaces/direct_output_surface_ozone.h

Index: services/ui/surfaces/direct_output_surface_ozone.h
diff --git a/services/ui/surfaces/direct_output_surface_ozone.h b/services/ui/surfaces/direct_output_surface_ozone.h
index d7aa5c61091934105e6e087964960118c48e3757..085fb65dba42d5f88320de9188872dbc36b7fd73 100644
--- a/services/ui/surfaces/direct_output_surface_ozone.h
+++ b/services/ui/surfaces/direct_output_surface_ozone.h
@@ -11,6 +11,7 @@
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
 #include "components/display_compositor/gl_helper.h"
+#include "services/ui/surfaces/ozone_gpu_memory_buffer_manager.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/swap_result.h"
@@ -71,6 +72,7 @@ class DirectOutputSurfaceOzone : public cc::OutputSurface {
   void OnGpuSwapBuffersCompleted(gfx::SwapResult result);
 
   display_compositor::GLHelper gl_helper_;
+  std::unique_ptr<OzoneGpuMemoryBufferManager> ozone_gpu_memory_buffer_manager_;
   std::unique_ptr<display_compositor::BufferQueue> buffer_queue_;
   cc::SyntheticBeginFrameSource* const synthetic_begin_frame_source_;