Revert of Introduce GpuVideoDecodeAcceleratorFactory.

content/common/gpu/media/vt_video_decode_accelerator_mac.h

Index: content/common/gpu/media/vt_video_decode_accelerator_mac.h
diff --git a/content/common/gpu/media/vt_video_decode_accelerator_mac.h b/content/common/gpu/media/vt_video_decode_accelerator_mac.h
index 031b46a029070507b6f20ac450e47ed47b42054d..c3e75e9e860b6fe2c562aa99fca9e61b6d1c4f6b 100644
--- a/content/common/gpu/media/vt_video_decode_accelerator_mac.h
+++ b/content/common/gpu/media/vt_video_decode_accelerator_mac.h
@@ -17,7 +17,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
-#include "content/common/gpu/media/gpu_video_decode_accelerator_helpers.h"
 #include "content/common/gpu/media/vt_mac.h"
 #include "media/filters/h264_parser.h"
 #include "media/video/h264_poc.h"
@@ -36,9 +35,8 @@
 class VTVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
  public:
   explicit VTVideoDecodeAccelerator(
-      const MakeGLContextCurrentCallback& make_context_current_cb,
-      const BindGLImageCallback& bind_image_cb);
-
+      const MakeContextCurrentCallback& make_context_current,
+      const BindImageCallback& bind_image);
   ~VTVideoDecodeAccelerator() override;
 
   // VideoDecodeAccelerator implementation.
@@ -50,10 +48,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;
 
   // Called by OutputThunk() when VideoToolbox finishes decoding a frame.
   void Output(
@@ -193,8 +188,8 @@
   //
   // GPU thread state.
   //
-  MakeGLContextCurrentCallback make_context_current_cb_;
-  BindGLImageCallback bind_image_cb_;
+  MakeContextCurrentCallback make_context_current_;
+  BindImageCallback bind_image_;
   media::VideoDecodeAccelerator::Client* client_;
   State state_;