Revert of Introduce components/display_compositor

content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc

 // Copyright 2014 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.
 
 #include "content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
-#include "components/display_compositor/buffer_queue.h"
-#include "components/display_compositor/gl_helper.h"
 #include "content/browser/compositor/browser_compositor_overlay_candidate_validator.h"
+#include "content/browser/compositor/buffer_queue.h"
+#include "content/browser/compositor/gl_helper.h"
 #include "content/browser/compositor/reflector_impl.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
 namespace content {
 
 GpuSurfacelessBrowserCompositorOutputSurface::
     GpuSurfacelessBrowserCompositorOutputSurface(
@@ skipping 18 matching lines @@
   capabilities_.flipped_output_surface = true;
   // Set |max_frames_pending| to 2 for surfaceless, which aligns scheduling
   // more closely with the previous surfaced behavior.
   // With a surface, swap buffer ack used to return early, before actually
   // presenting the back buffer, enabling the browser compositor to run ahead.
   // Surfaceless implementation acks at the time of actual buffer swap, which
   // shifts the start of the new frame forward relative to the old
   // implementation.
   capabilities_.max_frames_pending = 2;
 
-  gl_helper_.reset(new display_compositor::GLHelper(
-      context_provider_->ContextGL(), context_provider_->ContextSupport()));
-  output_surface_.reset(new display_compositor::BufferQueue(
+  gl_helper_.reset(new GLHelper(context_provider_->ContextGL(),
+                                context_provider_->ContextSupport()));
+  output_surface_.reset(new BufferQueue(
       context_provider_, target, internalformat_, gl_helper_.get(),
       gpu_memory_buffer_manager_, surface_id));
   output_surface_->Initialize();
 }
 
 GpuSurfacelessBrowserCompositorOutputSurface::
     ~GpuSurfacelessBrowserCompositorOutputSurface() {
 }
 
 bool GpuSurfacelessBrowserCompositorOutputSurface::IsDisplayedAsOverlayPlane()
@@ skipping 44 matching lines @@
     output_surface_->RecreateBuffers();
     force_swap = true;
   }
   GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted(latency_info,
                                                                result);
   if (force_swap)
     client_->SetNeedsRedrawRect(gfx::Rect(SurfaceSize()));
 }
 
 }  // namespace content