Move components/display_compositor to components/viz/display_compositor

content/browser/compositor/gpu_output_surface_mac.mm

 // 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.
 
 #include "content/browser/compositor/gpu_output_surface_mac.h"
 
 #include "cc/output/output_surface_client.h"
 #include "cc/output/output_surface_frame.h"
-#include "components/display_compositor/compositor_overlay_candidate_validator.h"
+#include "components/viz/display_compositor/compositor_overlay_candidate_validator.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/ipc/client/gpu_process_hosted_ca_layer_tree_params.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 #include "ui/base/cocoa/remote_layer_api.h"
 #include "ui/compositor/compositor.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/gfx/mac/io_surface.h"
 
 namespace content {
@@ skipping 26 matching lines @@
 
   base::scoped_nsobject<CALayerHost> content_layer;
   base::scoped_nsobject<CALayerHost> fullscreen_low_power_layer;
 };
 
 GpuOutputSurfaceMac::GpuOutputSurfaceMac(
     gfx::AcceleratedWidget widget,
     scoped_refptr<ui::ContextProviderCommandBuffer> context,
     gpu::SurfaceHandle surface_handle,
     const UpdateVSyncParametersCallback& update_vsync_parameters_callback,
-    std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
+    std::unique_ptr<viz::CompositorOverlayCandidateValidator>
         overlay_candidate_validator,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager)
     : GpuSurfacelessBrowserCompositorOutputSurface(
           std::move(context),
           surface_handle,
           update_vsync_parameters_callback,
           std::move(overlay_candidate_validator),
           GL_TEXTURE_RECTANGLE_ARB,
           GL_RGBA,
           gfx::BufferFormat::RGBA_8888,
@@ skipping 64 matching lines @@
           SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED;
     }
   }
 }
 
 bool GpuOutputSurfaceMac::SurfaceIsSuspendForRecycle() const {
   return should_show_frames_state_ == SHOULD_NOT_SHOW_FRAMES_SUSPENDED;
 }
 
 }  // namespace content