Revert of Introduce components/display_compositor

content/browser/compositor/gpu_process_transport_factory.h

Index: content/browser/compositor/gpu_process_transport_factory.h
diff --git a/content/browser/compositor/gpu_process_transport_factory.h b/content/browser/compositor/gpu_process_transport_factory.h
index 4bd1886bc41875b1d11dfa8bee5bac2004c2d931..a8836e253d4eb8feca4dfbef3966dda46ab57625 100644
--- a/content/browser/compositor/gpu_process_transport_factory.h
+++ b/content/browser/compositor/gpu_process_transport_factory.h
@@ -68,7 +68,7 @@
   // ImageTransportFactory implementation.
   ui::ContextFactory* GetContextFactory() override;
   cc::SurfaceManager* GetSurfaceManager() override;
-  display_compositor::GLHelper* GetGLHelper() override;
+  GLHelper* GetGLHelper() override;
   void AddObserver(ImageTransportFactoryObserver* observer) override;
   void RemoveObserver(ImageTransportFactoryObserver* observer) override;
 #if defined(OS_MACOSX)
@@ -98,7 +98,7 @@
   typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap;
   PerCompositorDataMap per_compositor_data_;
   scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_;
-  std::unique_ptr<display_compositor::GLHelper> gl_helper_;
+  std::unique_ptr<GLHelper> gl_helper_;
   base::ObserverList<ImageTransportFactoryObserver> observer_list_;
   std::unique_ptr<cc::SurfaceManager> surface_manager_;
   uint32_t next_surface_id_namespace_;