Revert of services/ui: Revert CLs that broke Windows.

services/ui/surfaces/direct_output_surface_ozone.cc

Index: services/ui/surfaces/direct_output_surface_ozone.cc
diff --git a/services/ui/surfaces/direct_output_surface_ozone.cc b/services/ui/surfaces/direct_output_surface_ozone.cc
index 57e1c860753aeb2475dea3d5b9acdb90e35acd5d..38bf776d22e3add2271dde980aa1afc6f298608c 100644
--- a/services/ui/surfaces/direct_output_surface_ozone.cc
+++ b/services/ui/surfaces/direct_output_surface_ozone.cc
@@ -35,16 +35,9 @@
                  context_provider->ContextSupport()),
       synthetic_begin_frame_source_(synthetic_begin_frame_source),
       weak_ptr_factory_(this) {
-  if (!GpuService::UseChromeGpuCommandBuffer()) {
-    ozone_gpu_memory_buffer_manager_.reset(new OzoneGpuMemoryBufferManager());
-    buffer_queue_.reset(new BufferQueue(
-        context_provider->ContextGL(), target, internalformat, &gl_helper_,
-        ozone_gpu_memory_buffer_manager_.get(), widget));
-  } else {
-    buffer_queue_.reset(new BufferQueue(
-        context_provider->ContextGL(), target, internalformat, &gl_helper_,
-        MusGpuMemoryBufferManager::current(), widget));
-  }
+  buffer_queue_.reset(new BufferQueue(
+      context_provider->ContextGL(), target, internalformat, &gl_helper_,
+      MusGpuMemoryBufferManager::current(), widget));
 
   capabilities_.uses_default_gl_framebuffer = false;
   capabilities_.flipped_output_surface = true;