Add use_v4l2_codec use flag to include v4l2 codec on x86 CrOS.

content/content_common.gypi

Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index e3d3b087423bbd90fb4d9140dc9094d5d5fd57fb..87f3015b52a2b499fc69ea819997d2b201eeb7d0 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -32,6 +32,7 @@
   ],
   'variables': {
     'use_v4lplugin%': 0,
+    'use_v4l2_codec%': 0,
     'public_common_sources': [
       'public/common/appcache_info.h',
       'public/common/bindings_policy.h',
@@ -804,15 +805,13 @@
         },
       ],
     }],
-    ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
+    ['chromeos==1 and ((target_arch=="arm" and use_x11==1) or use_v4l2_codec==1)', {
       'dependencies': [
         '../media/media.gyp:media',
       ],
       'sources': [
         'common/gpu/media/generic_v4l2_video_device.cc',
         'common/gpu/media/generic_v4l2_video_device.h',
-        'common/gpu/media/tegra_v4l2_video_device.cc',
-        'common/gpu/media/tegra_v4l2_video_device.h',
         'common/gpu/media/v4l2_image_processor.cc',
         'common/gpu/media/v4l2_image_processor.h',
         'common/gpu/media/v4l2_video_decode_accelerator.cc',
@@ -825,6 +824,14 @@
       'include_dirs': [
         '<(DEPTH)/third_party/khronos',
       ],
+      'conditions': [
+        ['target_arch == "arm"', {
+          'sources': [
+            'common/gpu/media/tegra_v4l2_video_device.cc',
+            'common/gpu/media/tegra_v4l2_video_device.h',
+          ],
+        }],
+      ],
     }],
     ['target_arch != "arm" and chromeos == 1', {
       'dependencies': [