Include angle tests in gpu_unittests

gpu/gpu.gyp

Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 316aa914422f377e672ec0d387fc096c16d03293..229b47d0faad875e1c50dd63dca63c544be44c79 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -118,6 +118,34 @@
       ],
     },
     {
+      'target_name': 'angle_unittests',
+      'type': '<(gtest_target_type)',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/angle_dx11/src/build_angle.gyp:translator_static',
+      ],
+      'variables': {
+        'ANGLE_DIR': '../third_party/angle_dx11',
+      },
+      'includes': [
+        '../third_party/angle_dx11/tests/preprocessor_tests/preprocessor_tests.gypi',
+        '../third_party/angle_dx11/tests/compiler_tests/compiler_tests.gypi',
+      ],
+      'include_dirs': [
+        '..',
+        '../third_party/angle_dx11/include',
+        '../third_party/angle_dx11/src',
+        '../third_party/angle_dx11/src/compiler/preprocessor',
+        '../third_party/angle_dx11/tests',
+      ],
+      'sources': [
+        'angle_unittest_main.cc',
+      ],
+    },
+    {
       'target_name': 'gpu_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
@@ -125,7 +153,7 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
+        '../third_party/angle_dx11/src/build_angle.gyp:translator_static',
         '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui',
         'command_buffer/command_buffer.gyp:gles2_utils',
@@ -252,7 +280,7 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
+        '../third_party/angle_dx11/src/build_angle.gyp:translator_static',
         '../ui/ui.gyp:ui',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'command_buffer_client',