Revert 137988 - VAVDA is the hardware video decode accelerator for Chrome on Linux and ChromeOS for…

content/common/gpu/media/gpu_video_decode_accelerator.cc

Index: content/common/gpu/media/gpu_video_decode_accelerator.cc
===================================================================
--- content/common/gpu/media/gpu_video_decode_accelerator.cc	(revision 138207)
+++ content/common/gpu/media/gpu_video_decode_accelerator.cc	(working copy)
@@ -21,24 +21,15 @@
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 
+#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)) || defined(OS_WIN)
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
-#endif  // OS_WIN
-
-#if defined(OS_CHROMEOS)
-#if defined(ARCH_CPU_ARMEL)
+#else  // OS_WIN
 #include "content/common/gpu/media/omx_video_decode_accelerator.h"
-#elif defined(ARCH_CPU_X86_FAMILY)
-#include "ui/gl/gl_context_glx.h"
-#include "ui/gl/gl_surface_glx.h"
-#include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
-#endif  // ARCH_CPU_ARMEL
-#endif  // OS_CHROMEOS
-
-#if defined(OS_WIN) || defined(OS_CHROMEOS)
+#endif  // OS_WIN
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface_egl.h"
-#endif  // OS_WIN || OS_CHROMEOS
+#endif
 
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gfx/size.h"
@@ -131,7 +122,7 @@
   DCHECK(init_done_msg);
   init_done_msg_ = init_done_msg;
 
-#if defined(OS_CHROMEOS) || defined(OS_WIN)
+#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)) || defined(OS_WIN)
   DCHECK(stub_ && stub_->decoder());
 #if defined(OS_WIN)
   if (base::win::GetVersion() < base::win::VERSION_WIN7) {
@@ -142,22 +133,12 @@
   DLOG(INFO) << "Initializing DXVA HW decoder for windows.";
   DXVAVideoDecodeAccelerator* video_decoder =
       new DXVAVideoDecodeAccelerator(this);
-#elif defined(OS_CHROMEOS)  // OS_WIN
-#if defined(ARCH_CPU_ARMEL)
+#else  // OS_WIN
   OmxVideoDecodeAccelerator* video_decoder =
       new OmxVideoDecodeAccelerator(this);
   video_decoder->SetEglState(
       gfx::GLSurfaceEGL::GetHardwareDisplay(),
       stub_->decoder()->GetGLContext()->GetHandle());
-#elif defined(ARCH_CPU_X86_FAMILY)
-  VaapiVideoDecodeAccelerator* video_decoder =
-      new VaapiVideoDecodeAccelerator(this);
-  gfx::GLContextGLX* glx_context =
-      static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext());
-  GLXContext glx_context_handle =
-      static_cast<GLXContext>(glx_context->GetHandle());
-  video_decoder->SetGlxState(glx_context->display(), glx_context_handle);
-#endif  // ARCH_CPU_ARMEL
 #endif  // OS_WIN
   video_decode_accelerator_ = video_decoder;
   if (!video_decode_accelerator_->Initialize(profile))
@@ -165,7 +146,7 @@
 #else  // Update RenderViewImpl::createMediaPlayer when adding clauses.
   NOTIMPLEMENTED() << "HW video decode acceleration not available.";
   NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
-#endif  // defined(OS_CHROMEOS) || defined(OS_WIN)
+#endif  // defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
 }
 
 void GpuVideoDecodeAccelerator::OnDecode(