Revert of Introduce GpuVideoDecodeAcceleratorFactory.

content/common/gpu/media/android_video_decode_accelerator_unittest.cc

Index: content/common/gpu/media/android_video_decode_accelerator_unittest.cc
diff --git a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc
index f0500446634f9d93a76c3d8d663fc9b26cf86e21..751933a51a341a51e5c714e73852dca08e74eac5 100644
--- a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc
+++ b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc
@@ -25,11 +25,6 @@
 
 bool MockMakeContextCurrent() {
   return true;
-}
-
-static base::WeakPtr<gpu::gles2::GLES2Decoder> MockGetGLES2Decoder(
-    const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder) {
-  return decoder;
 }
 
 }  // namespace
@@ -72,8 +67,7 @@
     scoped_ptr<MockVideoDecodeAcceleratorClient> client(
         new MockVideoDecodeAcceleratorClient());
     accelerator_.reset(new AndroidVideoDecodeAccelerator(
-        base::Bind(&MockMakeContextCurrent),
-        base::Bind(&MockGetGLES2Decoder, decoder->AsWeakPtr())));
+        decoder->AsWeakPtr(), base::Bind(&MockMakeContextCurrent)));
   }
 
   bool Configure(media::VideoCodec codec) {