Move components/display_compositor to components/viz/display_compositor

components/viz/display_compositor/compositor_overlay_candidate_validator_ozone.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 COMPONENTS_DISPLAY_COMPOSITOR_COMPOSITOR_OVERLAY_CANDIDATE_VALIDATOR_OZONE_H_
-#define COMPONENTS_DISPLAY_COMPOSITOR_COMPOSITOR_OVERLAY_CANDIDATE_VALIDATOR_OZONE_H_
+#ifndef COMPONENTS_VIZ_DISPLAY_COMPOSITOR_COMPOSITOR_OVERLAY_CANDIDATE_VALIDATOR_OZONE_H_
+#define COMPONENTS_VIZ_DISPLAY_COMPOSITOR_COMPOSITOR_OVERLAY_CANDIDATE_VALIDATOR_OZONE_H_
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "components/display_compositor/compositor_overlay_candidate_validator.h"
-#include "components/display_compositor/display_compositor_export.h"
+#include "components/viz/display_compositor/compositor_overlay_candidate_validator.h"
+#include "components/viz/viz_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace ui {
 class OverlayCandidatesOzone;
 }
 
-namespace display_compositor {
+namespace viz {
 
-class DISPLAY_COMPOSITOR_EXPORT CompositorOverlayCandidateValidatorOzone
+class VIZ_EXPORT CompositorOverlayCandidateValidatorOzone
     : public CompositorOverlayCandidateValidator {
  public:
   CompositorOverlayCandidateValidatorOzone(
       std::unique_ptr<ui::OverlayCandidatesOzone> overlay_candidates,
       std::string strategies_string);
   ~CompositorOverlayCandidateValidatorOzone() override;
 
   // cc::OverlayCandidateValidator implementation.
   void GetStrategies(cc::OverlayProcessor::StrategyList* strategies) override;
   bool AllowCALayerOverlays() override;
@@ skipping 10 matching lines @@
       base::Callback<std::unique_ptr<cc::OverlayProcessor::Strategy>(
           CompositorOverlayCandidateValidatorOzone*)>;
   // List callbacks used to instantiate OverlayProcessor::Strategy
   // as defined by |strategies_string| paramter in the constructor.
   std::vector<StrategyInstantiator> strategies_instantiators_;
   bool software_mirror_active_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorOverlayCandidateValidatorOzone);
 };
 
-}  // namespace display_compositor
+}  // namespace viz
 
-#endif  // COMPONENTS_DISPLAY_COMPOSITOR_COMPOSITOR_OVERLAY_CANDIDATE_VALIDATOR_OZONE_H_
+#endif  // COMPONENTS_VIZ_DISPLAY_COMPOSITOR_COMPOSITOR_OVERLAY_CANDIDATE_VALIDATOR_OZONE_H_