services/ui: Revert CLs that broke Windows.

services/ui/surfaces/direct_output_surface_ozone.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_OZONE_H_
 #define SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_OZONE_H_
 
 #include <memory>
 
 #include "base/memory/weak_ptr.h"
 #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"
 #include "ui/gl/gl_surface.h"
 
 namespace display_compositor {
 class BufferQueue;
 }
 
 namespace ui {
@@ skipping 40 matching lines @@
   bool BindToClient(cc::OutputSurfaceClient* client) override;
 
   // Taken from BrowserCompositor specific API.
   void OnUpdateVSyncParametersFromGpu(base::TimeTicks timebase,
                                       base::TimeDelta interval);
 
   // Called when a swap completion is sent from the GPU process.
   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_;
 
   base::WeakPtrFactory<DirectOutputSurfaceOzone> weak_ptr_factory_;
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_OZONE_H_