Revert of Introduce components/display_compositor

content/browser/media/capture/aura_window_capture_machine.cc

Index: content/browser/media/capture/aura_window_capture_machine.cc
diff --git a/content/browser/media/capture/aura_window_capture_machine.cc b/content/browser/media/capture/aura_window_capture_machine.cc
index b959e153f658f60d03d379ce17e639b5e910b28e..a8e91a28b06670308d48f34612b8779f2a004e2e 100644
--- a/content/browser/media/capture/aura_window_capture_machine.cc
+++ b/content/browser/media/capture/aura_window_capture_machine.cc
@@ -11,7 +11,7 @@
 #include "base/metrics/histogram.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
-#include "components/display_compositor/gl_helper.h"
+#include "content/browser/compositor/gl_helper.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/media/capture/desktop_capture_device_uma_types.h"
 #include "content/public/browser/browser_thread.h"
@@ -252,7 +252,7 @@
     return false;
 
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
-  display_compositor::GLHelper* gl_helper = factory->GetGLHelper();
+  GLHelper* gl_helper = factory->GetGLHelper();
   if (!gl_helper)
     return false;
 
@@ -268,9 +268,13 @@
       yuv_readback_pipeline_->scaler()->SrcSize() != result_rect.size() ||
       yuv_readback_pipeline_->scaler()->SrcSubrect() != result_rect ||
       yuv_readback_pipeline_->scaler()->DstSize() != region_in_frame.size()) {
-    yuv_readback_pipeline_.reset(gl_helper->CreateReadbackPipelineYUV(
-        display_compositor::GLHelper::SCALER_QUALITY_FAST, result_rect.size(),
-        result_rect, region_in_frame.size(), true, true));
+    yuv_readback_pipeline_.reset(
+        gl_helper->CreateReadbackPipelineYUV(GLHelper::SCALER_QUALITY_FAST,
+                                             result_rect.size(),
+                                             result_rect,
+                                             region_in_frame.size(),
+                                             true,
+                                             true));
   }
 
   cursor_renderer_->SnapshotCursorState(region_in_frame);