Revert of Allow presenting DXGI share handles as overlays.

ui/gl/gl_image_dxgi.h

Index: ui/gl/gl_image_dxgi.h
diff --git a/ui/gl/gl_image_dxgi.h b/ui/gl/gl_image_dxgi.h
index 4ea5d87233e55eeb46d8843d1161279caab1e108..c61946100ee47b893d1061959b7e3275733e3fd3 100644
--- a/ui/gl/gl_image_dxgi.h
+++ b/ui/gl/gl_image_dxgi.h
@@ -5,7 +5,6 @@
 #include <d3d11.h>
 
 #include "base/win/scoped_comptr.h"
-#include "base/win/scoped_handle.h"
 #include "ui/gl/gl_export.h"
 #include "ui/gl/gl_image.h"
 
@@ -13,12 +12,12 @@
 
 namespace gl {
 
-class GL_EXPORT GLImageDXGIBase : public GLImage {
+class GL_EXPORT GLImageDXGI : public GLImage {
  public:
-  GLImageDXGIBase(const gfx::Size& size);
+  GLImageDXGI(const gfx::Size& size, EGLStreamKHR stream);
 
   // Safe downcast. Returns nullptr on failure.
-  static GLImageDXGIBase* FromGLImage(GLImage* image);
+  static GLImageDXGI* FromGLImage(GLImage* image);
 
   // GLImage implementation.
   gfx::Size GetSize() override;
@@ -40,32 +39,21 @@
                     const std::string& dump_name) override;
   Type GetType() const override;
 
+  void SetTexture(const base::win::ScopedComPtr<ID3D11Texture2D>& texture,
+                  size_t level);
+
   base::win::ScopedComPtr<ID3D11Texture2D> texture() { return texture_; }
   size_t level() const { return level_; }
 
  protected:
-  ~GLImageDXGIBase() override;
+  ~GLImageDXGI() override;
 
   gfx::Size size_;
 
+  EGLStreamKHR stream_;
+
   base::win::ScopedComPtr<ID3D11Texture2D> texture_;
   size_t level_ = 0;
-};
-
-class GL_EXPORT GLImageDXGI : public GLImageDXGIBase {
- public:
-  GLImageDXGI(const gfx::Size& size, EGLStreamKHR stream);
-
-  // GLImage implementation.
-  bool BindTexImage(unsigned target) override;
-
-  void SetTexture(const base::win::ScopedComPtr<ID3D11Texture2D>& texture,
-                  size_t level);
-
- protected:
-  ~GLImageDXGI() override;
-
-  EGLStreamKHR stream_;
 };
 
 // This copies to a new texture on bind.
@@ -98,18 +86,4 @@
   base::win::ScopedComPtr<ID3D11Texture2D> decoder_copy_texture_;
   base::win::ScopedComPtr<ID3D11VideoProcessorOutputView> output_view_;
 };
-
-class GL_EXPORT GLImageDXGIHandle : public GLImageDXGIBase {
- public:
-  GLImageDXGIHandle(const gfx::Size& size,
-                    base::win::ScopedHandle handle,
-                    uint32_t level);
-
-  bool Initialize();
-
- protected:
-  ~GLImageDXGIHandle() override;
-
-  base::win::ScopedHandle handle_;
-};
 }