Move components/display_compositor to components/viz/display_compositor

content/browser/compositor/gpu_browser_compositor_output_surface.h

 // 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.
 
 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
 #define CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "content/browser/compositor/browser_compositor_output_surface.h"
 #include "content/browser/compositor/gpu_vsync_begin_frame_source.h"
 #include "ui/gfx/swap_result.h"
 
-namespace display_compositor {
+namespace viz {
 class CompositorOverlayCandidateValidator;
 }
 
 namespace gpu {
 class CommandBufferProxyImpl;
 struct GpuProcessHostedCALayerTreeParamsMac;
 }
 
 namespace ui {
 class ContextProviderCommandBuffer;
 class LatencyInfo;
 }
 
 namespace content {
 class ReflectorTexture;
 
 // Adapts a WebGraphicsContext3DCommandBufferImpl into a
 // cc::OutputSurface that also handles vsync parameter updates
 // arriving from the GPU process.
 class GpuBrowserCompositorOutputSurface : public BrowserCompositorOutputSurface,
                                           public GpuVSyncControl {
  public:
   GpuBrowserCompositorOutputSurface(
       scoped_refptr<ui::ContextProviderCommandBuffer> context,
       const UpdateVSyncParametersCallback& update_vsync_parameters_callback,
-      std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
+      std::unique_ptr<viz::CompositorOverlayCandidateValidator>
           overlay_candidate_validator);
 
   ~GpuBrowserCompositorOutputSurface() override;
 
   // Called when a swap completion is sent from the GPU process.
   // The argument |params_mac| is used to communicate parameters needed on Mac
   // to display the CALayer for the swap in the browser process.
   // TODO(ccameron): Remove |params_mac| when the CALayer tree is hosted in the
   // browser process.
   virtual void OnGpuSwapBuffersCompleted(
@@ skipping 39 matching lines @@
   gfx::Size size_;
   base::WeakPtrFactory<GpuBrowserCompositorOutputSurface> weak_ptr_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_