Update from https://crrev.com/320343

gpu/BUILD.gn

 # Copyright 2014 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.
 
 # GYP-to-GN project mappings:
 #
 #  gpu.gyp:command_buffer_client => //gpu/command_buffer/client
 #
 #  gpu.gyp:command_buffer_common => //gpu/command_buffer/common
 #
@@ skipping 15 matching lines @@
 #  gpu.gyp:disk_cache_proto => //gpu/command_buffer/service:disk_cache_proto
 #
 #  command_buffer/command_buffer.gyp:gles2_utils =>
 #     //gpu/command_buffer/common
 #     (Merged in to here because the separate file exists in GYP only to break
 #     a .gyp file dependency cycle which GN doesn't have.)
 #
 # gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings => //gpu/skia_bindings
 
 import("//testing/test.gni")
+import("//build/config/ui.gni")
 
 component("gpu") {
   public_deps = [
     "//gpu/command_buffer/client",
     "//gpu/command_buffer/client:gles2_cmd_helper_sources",
     "//gpu/command_buffer/common",
     "//gpu/command_buffer/service",
     "//gpu/config",
   ]
 }
@@ skipping 130 matching lines @@
     "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_buffers.cc",
     "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_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_valuebuffer.cc",
     "command_buffer/service/gpu_scheduler_unittest.cc",
     "command_buffer/service/gpu_service_test.cc",
     "command_buffer/service/gpu_service_test.h",
@@ skipping 56 matching lines @@
   sources = [
     "perftests/measurements.cc",
     "perftests/run_all_tests.cc",
     "perftests/texture_upload_perftest.cc",
   ]
 
   deps = [
     "//base",
     "//base/test:test_support",
     "//gpu/command_buffer/service",
+    "//testing/gmock",
     "//testing/gtest",
     "//testing/perf",
     "//ui/gfx/geometry",
     "//ui/gl",
   ]
 }
 
 test("angle_unittests") {
   sources = [
     "angle_unittest_main.cc",
   ]
 
   deps = [
     "//base",
     "//base/test:test_support",
     "//base/third_party/dynamic_annotations",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/angle:translator_static",
   ]
 }
+
+if (is_linux && !is_chromeos && target_cpu != "arm" && use_x11) {
+  executable("compositor_model_bench") {
+    sources = [
+      "tools/compositor_model_bench/compositor_model_bench.cc",
+      "tools/compositor_model_bench/forward_render_model.cc",
+      "tools/compositor_model_bench/render_model_utils.cc",
+      "tools/compositor_model_bench/render_models.cc",
+      "tools/compositor_model_bench/render_tree.cc",
+      "tools/compositor_model_bench/shaders.cc",
+    ]
+
+    libs = [ "GL" ]
+
+    configs += [ "//build/config/linux:x11" ]
+
+    deps = [
+      "//base",
+      "//ui/gl",
+    ]
+  }
+}