Chrome for arm seems to make the implicit assumption that

chromeos is the target in a few places.
Make this assumption explicit.
Also enable nacl in the non-chromeos case so we can start debugging.

Review URL: http://codereview.chromium.org/8776009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114039 0039d316-1c4b-4281-b951-d872f2087c98

content/content_common.gypi

@@ -292,7 +292,7 @@
         ],
       },
     }],
-    ['use_x11 == 1 and target_arch != "arm"', {
+    ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
       'sources': [
         'common/gpu/x_util.cc',
         'common/gpu/x_util.h',
@@ -303,7 +303,7 @@
         '../gpu/gpu.gyp:command_buffer_service',
       ],
     }],
-    ['target_arch=="arm"', {
+    ['target_arch=="arm" and chromeos == 1', {
       'dependencies': [
         '../media/media.gyp:media',
       ],