Revert "Enable compilation of angle_end2end_tests on Linux"

gpu/gpu.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'nacl_win64_target': 0,
   },
   'includes': [
     'gpu_common.gypi',
@@ skipping 688 matching lines @@
           'dependencies': [
             'gpu_perftests',
           ],
           'variables': {
             'test_suite_name': 'gpu_perftests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
-    ['OS == "win" or (OS == "linux" and use_x11==1)', {
+    ['OS == "win"', {
       'targets': [
         {
           # TODO(kbr): port this target to the GN build.
           'target_name': 'angle_end2end_tests',
           'type': '<(gtest_target_type)',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
           ],
           'includes': [
             '../third_party/angle/build/common_defines.gypi',
             '../third_party/angle/src/tests/angle_end2end_tests.gypi',
           ],
           'sources': [
             'angle_end2end_tests_main.cc',
           ],
         },
-      ],
-    }],
-    ['OS == "win"', {
-      'targets': [
         {
           # TODO(jmadill): port this target to the GN build.
           'target_name': 'angle_perftests',
           'type': '<(gtest_target_type)',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
           ],
           'includes': [
             '../third_party/angle/build/common_defines.gypi',
@@ skipping 26 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }