Move components/display_compositor to components/viz/display_compositor

services/ui/surfaces/display_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_DISPLAY_OUTPUT_SURFACE_OZONE_H_
 #define SERVICES_UI_SURFACES_DISPLAY_OUTPUT_SURFACE_OZONE_H_
 
 #include <memory>
 
 #include "base/memory/weak_ptr.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/in_process_context_provider.h"
 #include "cc/output/output_surface.h"
-#include "components/display_compositor/gl_helper.h"
+#include "components/viz/display_compositor/gl_helper.h"
 #include "services/ui/surfaces/display_output_surface.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 cc {
 class SyntheticBeginFrameSource;
 }
 
-namespace display_compositor {
+namespace viz {
 class BufferQueue;
 }
 
 namespace gpu {
 class GpuMemoryBufferManager;
 }
 
 namespace ui {
 
 // An OutputSurface implementation that directly draws and swap to a GL
@@ skipping 23 matching lines @@
                bool has_alpha,
                bool use_stencil) override;
   void SwapBuffers(cc::OutputSurfaceFrame frame) override;
   uint32_t GetFramebufferCopyTextureFormat() override;
   bool IsDisplayedAsOverlayPlane() const override;
   unsigned GetOverlayTextureId() const override;
 
   // DisplayOutputSurface:
   void DidReceiveSwapBuffersAck(gfx::SwapResult result) override;
 
-  display_compositor::GLHelper gl_helper_;
-  std::unique_ptr<display_compositor::BufferQueue> buffer_queue_;
+  viz::GLHelper gl_helper_;
+  std::unique_ptr<viz::BufferQueue> buffer_queue_;
 
   gfx::Size reshape_size_;
   gfx::Size swap_size_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayOutputSurfaceOzone);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SURFACES_DISPLAY_OUTPUT_SURFACE_OZONE_H_