Update from https://crrev.com/312398

cc/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.
 
+import("//testing/test.gni")
+
 component("cc") {
   sources = [
     "animation/animation.cc",
     "animation/animation.h",
     "animation/animation_curve.cc",
     "animation/animation_curve.h",
     "animation/animation_delegate.h",
     "animation/animation_events.cc",
     "animation/animation_events.h",
     "animation/animation_id_provider.cc",
@@ skipping 56 matching lines @@
     "base/util.h",
     "debug/benchmark_instrumentation.cc",
     "debug/benchmark_instrumentation.h",
     "debug/debug_colors.cc",
     "debug/debug_colors.h",
     "debug/debug_rect_history.cc",
     "debug/debug_rect_history.h",
     "debug/devtools_instrumentation.h",
     "debug/frame_rate_counter.cc",
     "debug/frame_rate_counter.h",
+    "debug/frame_timing_tracker.cc",
+    "debug/frame_timing_tracker.h",
     "debug/frame_viewer_instrumentation.cc",
     "debug/frame_viewer_instrumentation.h",
     "debug/invalidation_benchmark.cc",
     "debug/invalidation_benchmark.h",
     "debug/lap_timer.cc",
     "debug/lap_timer.h",
     "debug/layer_tree_debug_state.cc",
     "debug/layer_tree_debug_state.h",
     "debug/micro_benchmark.cc",
     "debug/micro_benchmark.h",
@@ skipping 231 matching lines @@
     "quads/yuv_video_draw_quad.cc",
     "quads/yuv_video_draw_quad.h",
     "resources/bitmap_content_layer_updater.cc",
     "resources/bitmap_content_layer_updater.h",
     "resources/bitmap_tile_task_worker_pool.cc",
     "resources/bitmap_tile_task_worker_pool.h",
     "resources/bitmap_skpicture_content_layer_updater.cc",
     "resources/bitmap_skpicture_content_layer_updater.h",
     "resources/clip_display_item.cc",
     "resources/clip_display_item.h",
+    "resources/clip_path_display_item.cc",
+    "resources/clip_path_display_item.h",
     "resources/content_layer_updater.cc",
     "resources/content_layer_updater.h",
     "resources/display_item.cc",
     "resources/display_item.h",
     "resources/display_item_list.cc",
     "resources/display_item_list.h",
     "resources/display_list_raster_source.cc",
     "resources/display_list_raster_source.h",
     "resources/display_list_recording_source.cc",
     "resources/display_list_recording_source.h",
@@ skipping 375 matching lines @@
     "animation/scrollbar_animation_controller_thinning_unittest.cc",
     "animation/transform_operations_unittest.cc",
     "base/float_quad_unittest.cc",
     "base/math_util_unittest.cc",
     "base/region_unittest.cc",
     "base/rolling_time_delta_history_unittest.cc",
     "base/scoped_ptr_vector_unittest.cc",
     "base/simple_enclosed_region_unittest.cc",
     "base/tiling_data_unittest.cc",
     "base/util_unittest.cc",
+    "debug/frame_timing_tracker_unittest.cc",
     "debug/micro_benchmark_controller_unittest.cc",
     "input/top_controls_manager_unittest.cc",
     "layers/contents_scaling_layer_unittest.cc",
     "layers/delegated_frame_provider_unittest.cc",
     "layers/delegated_frame_resource_collection_unittest.cc",
     "layers/delegated_renderer_layer_impl_unittest.cc",
     "layers/delegated_renderer_layer_unittest.cc",
     "layers/heads_up_display_unittest.cc",
     "layers/heads_up_display_layer_impl_unittest.cc",
     "layers/io_surface_layer_impl_unittest.cc",
     "layers/layer_impl_unittest.cc",
     "layers/layer_iterator_unittest.cc",
     "layers/layer_position_constraint_unittest.cc",
     "layers/layer_unittest.cc",
     "layers/layer_utils_unittest.cc",
     "layers/nine_patch_layer_impl_unittest.cc",
     "layers/nine_patch_layer_unittest.cc",
     "layers/painted_scrollbar_layer_impl_unittest.cc",
     "layers/picture_image_layer_impl_unittest.cc",
+    "layers/picture_image_layer_unittest.cc",
     "layers/picture_layer_impl_unittest.cc",
     "layers/picture_layer_unittest.cc",
     "layers/render_surface_unittest.cc",
     "layers/render_surface_impl_unittest.cc",
     "layers/scrollbar_layer_unittest.cc",
     "layers/solid_color_layer_impl_unittest.cc",
     "layers/solid_color_scrollbar_layer_impl_unittest.cc",
     "layers/surface_layer_unittest.cc",
     "layers/surface_layer_impl_unittest.cc",
     "layers/texture_layer_unittest.cc",
@@ skipping 125 matching lines @@
     "//gpu/command_buffer/common:gles2_utils",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
     "//testing/perf",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
   ]
 }