Clean up V4L2 codec-related flags and defines

content/common/gpu/media/gpu_video_decode_accelerator.cc

Index: content/common/gpu/media/gpu_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
index 8f187fdad8c199bf3b5ebe3832515108e8f7448e..93f31a2eb68e7a2dc04274bad820477902e0b5b0 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -30,12 +30,10 @@
 #elif defined(OS_MACOSX)
 #include "content/common/gpu/media/vt_video_decode_accelerator.h"
 #elif defined(OS_CHROMEOS)
-#if defined(ARCH_CPU_ARMEL) && defined(USE_LIBV4L2)
-#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"
+#include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"

[Pawel Osciak, 2015/01/22 08:30:02]

Lexicographical order please.

[henryhsu, 2015/01/22 09:09:09]

Done.

 // defined(ARCH_CPU_ARMEL) || (defined(USE_OZONE) && defined(USE_V4L2_CODEC))

[Pawel Osciak, 2015/01/22 08:30:02]

I think this is more confusing than helpful. I'd remove this comment.

[henryhsu, 2015/01/22 09:09:09]

Done.

 #endif
 #if defined(ARCH_CPU_X86_FAMILY)
@@ -322,7 +320,8 @@ GpuVideoDecodeAccelerator::CreateV4L2VDA() {
 scoped_ptr<media::VideoDecodeAccelerator>
 GpuVideoDecodeAccelerator::CreateV4L2SliceVDA() {
   scoped_ptr<media::VideoDecodeAccelerator> decoder;
-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_LIBV4L2)
+#if defined(OS_CHROMEOS) && (defined(ARCH_CPU_ARMEL) || \
+    (defined(USE_OZONE) && defined(USE_V4L2_CODEC)))
   scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder);
   if (device.get()) {
     decoder.reset(new V4L2SliceVideoDecodeAccelerator(