Update from https://crrev.com/309415

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 106 matching lines @@
         'command_buffer/command_buffer.gyp:gles2_utils',
         'command_buffer_client',
         'gles2_implementation_no_check',
       ],
       'sources': [
         '<@(gles2_c_lib_source_files)',
       ],
     },
     {
       # GN version: //gpu:angle_unittests
+      # TODO(kbr): port this refactoring to the GN build.
       'target_name': 'angle_unittests',
       'type': '<(gtest_target_type)',
+      'includes': [
+        '../third_party/angle/build/common_defines.gypi',
+        '../third_party/angle/tests/angle_unittests.gypi',
+      ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '<(angle_path)/src/angle.gyp:translator_static',
-      ],
-      'variables': {
-        'ANGLE_DIR': '<(angle_path)',
-      },
-      'includes': [
-        '../third_party/angle/tests/preprocessor_tests/preprocessor_tests.gypi',
-        '../third_party/angle/tests/compiler_tests/compiler_tests.gypi',
       ],
       'include_dirs': [
         '..',
-        '<(angle_path)/include',
-        '<(angle_path)/src',
-        '<(angle_path)/src/compiler/preprocessor',
-        '<(angle_path)/tests',
+        '../third_party/angle/include',
       ],
-      'sources': [
+      'sources':
+      [
         'angle_unittest_main.cc',
       ],
     },
     {
       # GN version: //gpu:gpu_unittests
       'target_name': 'gpu_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
@@ skipping 490 matching lines @@
           'dependencies': [
             'gpu_unittests',
           ],
           'variables': {
             'test_suite_name': 'gpu_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
+    ['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/tests/angle_end2end_tests.gypi',
+          ],
+          'sources':
+          [
+            'angle_end2end_tests_main.cc',
+          ],
+        },
+      ],
+    }],
   ],
 }