Simplify the assignment of use_x11.

build/common.gypi

@@ -36,17 +36,23 @@
             '-Wno-format-nonliteral',
         ],
 
-        'chromeos%': 0,
-        'conditions':
-        [
-            ['OS=="linux" and chromeos==0',
-            {
-                'use_x11%': 1,
-            },
-            {
-                'use_x11%': 0,
-            }],
-        ],
+        # Nested dictionnary hack to allow setting a default value for
+        # a variable and test it in the dict (merged in angle.gyp).
+        'variables':
+        {
+            'conditions':
+            [
+                ['OS=="linux"',
+                {
+                    'use_x11': 1,
+                },
+                {
+                    'use_x11': 0,
+                }],
+            ],
+        },
+        # Copy conditionally-set variables out one scope.
+        'use_x11%': '<(use_x11)',
     },
     'target_defaults':
     {

src/angle.gyp

@@ -17,25 +17,6 @@
         'angle_enable_d3d11%': 0,
         'angle_enable_gl%': 0,
         'angle_enable_hlsl%': 0,
-        # This nested dictionary hack comes from Chromium's build/common.gypi
-        # and is needed so we can both set a default value for this variable and
-        # test it in the same file.
-        'variables':
-        {
-            'chromeos%': 0,
-            'conditions':
-            [
-                ['OS=="linux" and chromeos==0',
-                {
-                    'use_x11%': 1,
-                },
-                {
-                    'use_x11%': 0,
-                }],
-            ],
-        },
-        # Copy conditionally-set variables out one scope.
-        'use_x11%': '<(use_x11)',
         'conditions':
         [
             ['OS=="win"',