Revert of Introduce GpuVideoDecodeAcceleratorFactory.

content/common/gpu/media/vaapi_video_decode_accelerator.h

Index: content/common/gpu/media/vaapi_video_decode_accelerator.h
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.h b/content/common/gpu/media/vaapi_video_decode_accelerator.h
index f9cfb90376c0e0676f2ef3d779ce62af2c6f57e0..d14b06a08a40048f51e46c0f40a02e633cce131f 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.h
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.h
@@ -26,7 +26,6 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "content/common/content_export.h"
-#include "content/common/gpu/media/gpu_video_decode_accelerator_helpers.h"
 #include "content/common/gpu/media/shared_memory_region.h"
 #include "content/common/gpu/media/vaapi_wrapper.h"
 #include "media/base/bitstream_buffer.h"
@@ -56,9 +55,8 @@
   class VaapiDecodeSurface;
 
   VaapiVideoDecodeAccelerator(
-      const MakeGLContextCurrentCallback& make_context_current_cb,
-      const BindGLImageCallback& bind_image_cb);
-
+      const MakeContextCurrentCallback& make_context_current,
+      const BindImageCallback& bind_image);
   ~VaapiVideoDecodeAccelerator() override;
 
   // media::VideoDecodeAccelerator implementation.
@@ -70,10 +68,7 @@
   void Flush() override;
   void Reset() override;
   void Destroy() override;
-  bool TryToSetupDecodeOnSeparateThread(
-      const base::WeakPtr<Client>& decode_client,
-      const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner)
-      override;
+  bool CanDecodeOnIOThread() override;
 
   static media::VideoDecodeAccelerator::SupportedProfiles
       GetSupportedProfiles();
@@ -183,6 +178,10 @@
   // Return a new VaapiDecodeSurface for decoding into, or nullptr if not
   // available.
   scoped_refptr<VaapiDecodeSurface> CreateSurface();
+
+
+  // Client-provided GL state.
+  MakeContextCurrentCallback make_context_current_;
 
   // VAVDA state.
   enum State {
@@ -304,11 +303,9 @@
   size_t requested_num_pics_;
   gfx::Size requested_pic_size_;
 
-  // Callback to make GL context current.
-  MakeGLContextCurrentCallback make_context_current_cb_;
-
-  // Callback to bind a GLImage to a given texture.
-  BindGLImageCallback bind_image_cb_;
+  // Binds the provided GLImage to a givenr client texture ID & texture target
+  // combination in GLES.
+  BindImageCallback bind_image_;
 
   // The WeakPtrFactory for |weak_this_|.
   base::WeakPtrFactory<VaapiVideoDecodeAccelerator> weak_this_factory_;