Update from https://crrev.com/316786

gpu/BUILD.gn

Index: gpu/BUILD.gn
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
index 089602631465ab74ad1f50820b189f88e8a6c1d2..e1d5348f27e5c44973f193f610ddc999239b4dfd 100644
--- a/gpu/BUILD.gn
+++ b/gpu/BUILD.gn
@@ -47,10 +47,10 @@ component("gpu") {
 source_set("test_support") {
   testonly = true
   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",
   ]
 
   public_deps = [
@@ -156,10 +156,10 @@ if (!is_win || link_chrome_on_windows) {
       "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.h",
       "command_buffer/service/async_pixel_transfer_delegate_mock.cc",
-      "command_buffer/service/async_pixel_transfer_manager_mock.h",
+      "command_buffer/service/async_pixel_transfer_delegate_mock.h",
       "command_buffer/service/async_pixel_transfer_manager_mock.cc",
+      "command_buffer/service/async_pixel_transfer_manager_mock.h",
       "command_buffer/service/buffer_manager_unittest.cc",
       "command_buffer/service/cmd_parser_test.cc",
       "command_buffer/service/command_buffer_service_unittest.cc",
@@ -167,6 +167,8 @@ if (!is_win || link_chrome_on_windows) {
       "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",
@@ -177,6 +179,7 @@ if (!is_win || link_chrome_on_windows) {
       "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",
@@ -185,33 +188,30 @@ if (!is_win || link_chrome_on_windows) {
       "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/valuebuffer_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_unittest.cc",
       "command_buffer/service/shader_translator_cache_unittest.cc",
+      "command_buffer/service/shader_translator_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/vertex_attrib_manager_unittest.cc",
+      "command_buffer/service/valuebuffer_manager_unittest.cc",
       "command_buffer/service/vertex_array_manager_unittest.cc",
-      "command_buffer/service/gpu_tracer_unittest.cc",
+      "command_buffer/service/vertex_attrib_manager_unittest.cc",
       "config/gpu_blacklist_unittest.cc",
       "config/gpu_control_list_entry_unittest.cc",
       "config/gpu_control_list_number_info_unittest.cc",
@@ -247,6 +247,7 @@ if (!is_win || link_chrome_on_windows) {
 
   test("gpu_perftests") {
     sources = [
+      "perftests/measurements.cc",
       "perftests/run_all_tests.cc",
       "perftests/texture_upload_perftest.cc",
     ]
@@ -254,6 +255,7 @@ if (!is_win || link_chrome_on_windows) {
     deps = [
       "//base",
       "//base/test:test_support",
+      "//gpu/command_buffer/service",
       "//testing/gtest",
       "//testing/perf",
       "//ui/gfx/geometry",