Update from https://crrev.com/316786

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 36 matching lines @@
         'gpu',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gl/gl.gyp:gl',
       ],
       'defines': [
         'GL_IN_PROCESS_CONTEXT_IMPLEMENTATION',
       ],
       'sources': [
+        'command_buffer/client/gl_in_process_context.cc',
         'command_buffer/client/gl_in_process_context.h',
-        'command_buffer/client/gl_in_process_context.cc',
         'command_buffer/client/gl_in_process_context_export.h',
       ],
     },
     {
       # Library emulates GLES2 using command_buffers.
       'target_name': 'gles2_implementation_no_check',
       'type': '<(component)',
       'defines': [
         'GLES2_IMPL_IMPLEMENTATION',
         'GLES2_CONFORMANCE_TESTS=1',
@@ skipping 118 matching lines @@
         'command_buffer/common/command_buffer_mock.cc',
         'command_buffer/common/command_buffer_mock.h',
         'command_buffer/common/command_buffer_shared_test.cc',
         'command_buffer/common/debug_marker_manager_unittest.cc',
         'command_buffer/common/gles2_cmd_format_test.cc',
         'command_buffer/common/gles2_cmd_format_test_autogen.h',
         'command_buffer/common/gles2_cmd_utils_unittest.cc',
         'command_buffer/common/id_allocator_test.cc',
         'command_buffer/common/trace_event.h',
         'command_buffer/common/unittest_main.cc',
+        'command_buffer/service/async_pixel_transfer_delegate_mock.cc',
         'command_buffer/service/async_pixel_transfer_delegate_mock.h',
-        'command_buffer/service/async_pixel_transfer_delegate_mock.cc',
+        'command_buffer/service/async_pixel_transfer_manager_mock.cc',
         'command_buffer/service/async_pixel_transfer_manager_mock.h',
-        'command_buffer/service/async_pixel_transfer_manager_mock.cc',
         'command_buffer/service/buffer_manager_unittest.cc',
         'command_buffer/service/cmd_parser_test.cc',
         'command_buffer/service/command_buffer_service_unittest.cc',
         'command_buffer/service/common_decoder_unittest.cc',
         'command_buffer/service/context_group_unittest.cc',
         'command_buffer/service/feature_info_unittest.cc',
         'command_buffer/service/framebuffer_manager_unittest.cc',
+        'command_buffer/service/gl_surface_mock.cc',
+        'command_buffer/service/gl_surface_mock.h',
         'command_buffer/service/gles2_cmd_decoder_unittest.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest.h',
         'command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h',
         'command_buffer/service/gles2_cmd_decoder_unittest_1.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h',
         'command_buffer/service/gles2_cmd_decoder_unittest_2.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h',
         'command_buffer/service/gles2_cmd_decoder_unittest_3.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h',
         'command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc',
+        'command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_base.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_base.h',
         'command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_extensions_autogen.h',
         'command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_programs.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_textures.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_valuebuffer.cc',
-        'command_buffer/service/gl_surface_mock.cc',
-        'command_buffer/service/gl_surface_mock.h',
         'command_buffer/service/gpu_scheduler_unittest.cc',
         'command_buffer/service/gpu_service_test.cc',
         'command_buffer/service/gpu_service_test.h',
+        'command_buffer/service/gpu_tracer_unittest.cc',
         'command_buffer/service/id_manager_unittest.cc',
         'command_buffer/service/mailbox_manager_unittest.cc',
         'command_buffer/service/memory_program_cache_unittest.cc',
         'command_buffer/service/mocks.cc',
         'command_buffer/service/mocks.h',
+        'command_buffer/service/program_cache_unittest.cc',
         'command_buffer/service/program_manager_unittest.cc',
         'command_buffer/service/query_manager_unittest.cc',
         'command_buffer/service/renderbuffer_manager_unittest.cc',
-        'command_buffer/service/program_cache_unittest.cc',
         'command_buffer/service/shader_manager_unittest.cc',
+        'command_buffer/service/shader_translator_cache_unittest.cc',
         'command_buffer/service/shader_translator_unittest.cc',
-        'command_buffer/service/shader_translator_cache_unittest.cc',
         'command_buffer/service/test_helper.cc',
         'command_buffer/service/test_helper.h',
         'command_buffer/service/texture_manager_unittest.cc',
         'command_buffer/service/transfer_buffer_manager_unittest.cc',
         'command_buffer/service/valuebuffer_manager_unittest.cc',
+        'command_buffer/service/vertex_array_manager_unittest.cc',
         'command_buffer/service/vertex_attrib_manager_unittest.cc',
-        'command_buffer/service/vertex_array_manager_unittest.cc',
-        'command_buffer/service/gpu_tracer_unittest.cc',
         'config/gpu_blacklist_unittest.cc',
         'config/gpu_control_list_entry_unittest.cc',
         'config/gpu_control_list_number_info_unittest.cc',
         'config/gpu_control_list_os_info_unittest.cc',
         'config/gpu_control_list_unittest.cc',
         'config/gpu_control_list_version_info_unittest.cc',
         'config/gpu_driver_bug_list_unittest.cc',
         'config/gpu_info_collector_unittest.cc',
         'config/gpu_info_unittest.cc',
         'config/gpu_test_config_unittest.cc',
@@ skipping 20 matching lines @@
       # GN version: //gpu/gpu_perftests
       'target_name': 'gpu_perftests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         '../testing/perf/perf_test.gyp:perf_test',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gl/gl.gyp:gl',
+        'command_buffer_service',
       ],
       'sources': [
+        'perftests/measurements.cc',
         'perftests/run_all_tests.cc',
         'perftests/texture_upload_perftest.cc',
       ],
     },
     {
       # GN version: //gpu:gl_tests
       'target_name': 'gl_tests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
@@ skipping 73 matching lines @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/khronos/khronos.gyp:khronos_headers',
         '../ui/gl/gl.gyp:gl_unittest_utils',
         'gpu',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'command_buffer/service/gles2_cmd_decoder_mock.cc',
-        'command_buffer/service/error_state_mock.cc',
         'command_buffer/client/gles2_interface_stub.cc',
         'command_buffer/client/gles2_interface_stub.h',
+        'command_buffer/service/error_state_mock.cc',
+        'command_buffer/service/gles2_cmd_decoder_mock.cc',
       ],
     },
   ],
   'conditions': [
     ['component=="static_library"', {
       'targets': [
          {
           # GN version: //gpu/command_buffer/service:disk_cache_proto
           'target_name': 'disk_cache_proto',
           'type': 'static_library',
@@ skipping 299 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'gpu_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }