Revert of GVDA, vdatest: Enable V4L2SliceVideoDecodeAccelerator. (patchset #1...

Revert of GVDA, vdatest: Enable V4L2SliceVideoDecodeAccelerator. (patchset #1 id:1 of https://codereview.chromium.org/808973004/)

Reason for revert:
Dependent on https://codereview.chromium.org/852103002/ which was reverted due to arm breakage

Original issue's description:
> GVDA, vdatest: Enable V4L2SliceVideoDecodeAccelerator.
>
> Instantiate V4L2SVDA in GVDA and vdatest to be used if the hardware
> cannot support the current frame-based API and try to use slice-based API
> instead.
>
> BUG=chrome-os-partner:33728
> TEST=vdatest,veatest,apprtc,video playback
>
> Committed: https://crrev.com/daa138be4bc9374516fa0f779cc5e5fb8c38fbe4
> Cr-Commit-Position: refs/heads/master@{#311465}

TBR=wuchengli@chromium.org,henryhsu@chromium.org,kcwu@chromium.org,posciak@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=chrome-os-partner:33728

Review URL: https://codereview.chromium.org/848233002

Cr-Commit-Position: refs/heads/master@{#311566}

content/common/gpu/media/gpu_video_decode_accelerator.cc

@@ -29,9 +29,6 @@
 #elif defined(OS_MACOSX)
 #include "content/common/gpu/media/vt_video_decode_accelerator.h"
 #elif defined(OS_CHROMEOS)
-#if defined(ARCH_CPU_ARMEL)
-#include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
-#endif  // defined(ARCH_CPU_ARMEL)
 #if defined(ARCH_CPU_ARMEL) || (defined(USE_OZONE) && defined(USE_V4L2_CODEC))
 #include "content/common/gpu/media/v4l2_video_decode_accelerator.h"
 #include "content/common/gpu/media/v4l2_video_device.h"
@@ -277,7 +274,6 @@ GpuVideoDecodeAccelerator::CreateVDAFps() {
   std::vector<GpuVideoDecodeAccelerator::CreateVDAFp> create_vda_fps;
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateDXVAVDA);
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateV4L2VDA);
-  create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateV4L2SliceVDA);
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateVaapiVDA);
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateVTVDA);
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateOzoneVDA);
@@ -318,24 +314,6 @@ GpuVideoDecodeAccelerator::CreateV4L2VDA() {
   return decoder.Pass();
 }
 
-scoped_ptr<media::VideoDecodeAccelerator>
-GpuVideoDecodeAccelerator::CreateV4L2SliceVDA() {
-  scoped_ptr<media::VideoDecodeAccelerator> decoder;
-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
-  scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder);
-  if (device.get()) {
-    decoder.reset(new V4L2SliceVideoDecodeAccelerator(
-        device,
-        gfx::GLSurfaceEGL::GetHardwareDisplay(),
-        stub_->decoder()->GetGLContext()->GetHandle(),
-        weak_factory_for_io_.GetWeakPtr(),
-        make_context_current_,
-        io_message_loop_));
-  }
-#endif
-  return decoder.Pass();
-}
-
 scoped_ptr<media::VideoDecodeAccelerator>
 GpuVideoDecodeAccelerator::CreateVaapiVDA() {
   scoped_ptr<media::VideoDecodeAccelerator> decoder;

content/common/gpu/media/gpu_video_decode_accelerator.h

@@ -77,7 +77,6 @@ class GpuVideoDecodeAccelerator
   std::vector<CreateVDAFp> CreateVDAFps();
   scoped_ptr<media::VideoDecodeAccelerator> CreateDXVAVDA();
   scoped_ptr<media::VideoDecodeAccelerator> CreateV4L2VDA();
-  scoped_ptr<media::VideoDecodeAccelerator> CreateV4L2SliceVDA();
   scoped_ptr<media::VideoDecodeAccelerator> CreateVaapiVDA();
   scoped_ptr<media::VideoDecodeAccelerator> CreateVTVDA();
   scoped_ptr<media::VideoDecodeAccelerator> CreateOzoneVDA();

content/common/gpu/media/video_decode_accelerator_unittest.cc

@@ -57,9 +57,6 @@
 #include "base/win/windows_version.h"
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
 #elif defined(OS_CHROMEOS)
-#if defined(ARCH_CPU_ARMEL)
-#include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
-#endif  // defined(ARCH_CPU_ARMEL)
 #if defined(ARCH_CPU_ARMEL) || (defined(USE_OZONE) && defined(USE_V4L2_CODEC))
 #include "content/common/gpu/media/v4l2_video_decode_accelerator.h"
 #include "content/common/gpu/media/v4l2_video_device.h"
@@ -291,7 +288,6 @@ class GLRenderingVDAClient
 
   scoped_ptr<media::VideoDecodeAccelerator> CreateDXVAVDA();
   scoped_ptr<media::VideoDecodeAccelerator> CreateV4L2VDA();
-  scoped_ptr<media::VideoDecodeAccelerator> CreateV4L2SliceVDA();
   scoped_ptr<media::VideoDecodeAccelerator> CreateVaapiVDA();
 
   void SetState(ClientState new_state);
@@ -454,24 +450,6 @@ GLRenderingVDAClient::CreateV4L2VDA() {
   return decoder.Pass();
 }
 
-scoped_ptr<media::VideoDecodeAccelerator>
-GLRenderingVDAClient::CreateV4L2SliceVDA() {
-  scoped_ptr<media::VideoDecodeAccelerator> decoder;
-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
-  scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder);
-  if (device.get()) {
-    base::WeakPtr<VideoDecodeAccelerator::Client> weak_client = AsWeakPtr();
-    decoder.reset(new V4L2SliceVideoDecodeAccelerator(
-        device,
-        static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()),
-        static_cast<EGLContext>(rendering_helper_->GetGLContextHandle()),
-        weak_client,
-        base::Bind(&DoNothingReturnTrue),
-        base::MessageLoopProxy::current()));
-  }
-#endif
-  return decoder.Pass();
-}
 scoped_ptr<media::VideoDecodeAccelerator>
 GLRenderingVDAClient::CreateVaapiVDA() {
   scoped_ptr<media::VideoDecodeAccelerator> decoder;
@@ -491,8 +469,7 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {
   scoped_ptr<media::VideoDecodeAccelerator> decoders[] = {
     CreateDXVAVDA(),
     CreateV4L2VDA(),
-    CreateV4L2SliceVDA(),
-    CreateVaapiVDA(),
+    CreateVaapiVDA()
   };
 
   for (size_t i = 0; i < arraysize(decoders); ++i) {