Move components/display_compositor to components/viz/display_compositor

content/browser/renderer_host/delegated_frame_host.cc

Index: content/browser/renderer_host/delegated_frame_host.cc
diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc
index 937512feb8f87e119ecece2d10ceb85dfcd81dad..f03a59eb3dea469b5bb3b986bd6e37b70c8b83ad 100644
--- a/content/browser/renderer_host/delegated_frame_host.cc
+++ b/content/browser/renderer_host/delegated_frame_host.cc
@@ -22,7 +22,7 @@
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_hittest.h"
 #include "cc/surfaces/surface_manager.h"
-#include "components/display_compositor/gl_helper.h"
+#include "components/viz/display_compositor/gl_helper.h"
 #include "content/browser/compositor/surface_utils.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/renderer_host/compositor_resize_lock.h"
@@ -348,7 +348,7 @@ void DelegatedFrameHost::AttemptFrameSubscriberCapture(
   if (!idle_frame_subscriber_textures_.empty()) {
     subscriber_texture = idle_frame_subscriber_textures_.back();
     idle_frame_subscriber_textures_.pop_back();
-  } else if (display_compositor::GLHelper* helper =
+  } else if (viz::GLHelper* helper =
                  ImageTransportFactory::GetInstance()->GetGLHelper()) {
     subscriber_texture = new OwnedMailbox(helper);
   }
@@ -556,7 +556,7 @@ void DelegatedFrameHost::CopyFromCompositingSurfaceFinishedForVideo(
 
   gpu::SyncToken sync_token;
   if (result) {
-    display_compositor::GLHelper* gl_helper =
+    viz::GLHelper* gl_helper =
         ImageTransportFactory::GetInstance()->GetGLHelper();
     gl_helper->GenerateSyncToken(&sync_token);
   }
@@ -628,7 +628,7 @@ void DelegatedFrameHost::CopyFromCompositingSurfaceHasResultForVideo(
   }
 
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
-  display_compositor::GLHelper* gl_helper = factory->GetGLHelper();
+  viz::GLHelper* gl_helper = factory->GetGLHelper();
   if (!gl_helper)
     return;
   if (subscriber_texture.get() && !subscriber_texture->texture_id())
@@ -641,7 +641,7 @@ void DelegatedFrameHost::CopyFromCompositingSurfaceHasResultForVideo(
 
   gfx::Rect result_rect(result->size());
 
-  display_compositor::ReadbackYUVInterface* yuv_readback_pipeline =
+  viz::ReadbackYUVInterface* yuv_readback_pipeline =
       dfh->yuv_readback_pipeline_.get();
   if (yuv_readback_pipeline == NULL ||
       yuv_readback_pipeline->scaler()->SrcSize() != result_rect.size() ||
@@ -655,11 +655,11 @@ void DelegatedFrameHost::CopyFromCompositingSurfaceHasResultForVideo(
     // When up-scaling, always use "best" because the quality improvement is
     // huge with insignificant performance penalty.  Note that this strategy
     // differs from single-frame snapshot capture.
-    display_compositor::GLHelper::ScalerQuality quality =
+    viz::GLHelper::ScalerQuality quality =
         ((result_rect.size().width() < region_in_frame.size().width()) &&
          (result_rect.size().height() < region_in_frame.size().height()))
-            ? display_compositor::GLHelper::SCALER_QUALITY_BEST
-            : display_compositor::GLHelper::SCALER_QUALITY_FAST;
+            ? viz::GLHelper::SCALER_QUALITY_BEST
+            : viz::GLHelper::SCALER_QUALITY_FAST;
 
     DVLOG(1) << "Re-creating YUV readback pipeline for source rect "
              << result_rect.ToString() << " and destination size "