Update from https://crrev.com/320931

cc/cc.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': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 51 matching lines @@
         'animation/timing_function.h',
         'animation/transform_operation.cc',
         'animation/transform_operation.h',
         'animation/transform_operations.cc',
         'animation/transform_operations.h',
         'base/completion_event.h',
         'base/delayed_unique_notifier.cc',
         'base/delayed_unique_notifier.h',
         'base/invalidation_region.cc',
         'base/invalidation_region.h',
-        'base/latency_info_swap_promise.cc',
-        'base/latency_info_swap_promise.h',
-        'base/latency_info_swap_promise_monitor.cc',
-        'base/latency_info_swap_promise_monitor.h',
         'base/math_util.cc',
         'base/math_util.h',
         'base/ref_counted_managed.h',
         'base/region.cc',
         'base/region.h',
         'base/rolling_time_delta_history.cc',
         'base/rolling_time_delta_history.h',
         'base/scoped_ptr_algorithm.h',
         'base/scoped_ptr_deque.h',
         'base/scoped_ptr_vector.h',
         'base/simple_enclosed_region.cc',
         'base/simple_enclosed_region.h',
-        'base/swap_promise.h',
-        'base/swap_promise_monitor.cc',
-        'base/swap_promise_monitor.h',
         'base/switches.cc',
         'base/switches.h',
         'base/synced_property.h',
         'base/tiling_data.cc',
         'base/tiling_data.h',
         'base/time_util.h',
         'base/unique_notifier.cc',
         'base/unique_notifier.h',
         'base/util.h',
         'debug/benchmark_instrumentation.cc',
@@ skipping 185 matching lines @@
         'output/filter_operations.cc',
         'output/filter_operations.h',
         'output/geometry_binding.cc',
         'output/geometry_binding.h',
         'output/gl_frame_data.cc',
         'output/gl_frame_data.h',
         'output/gl_renderer.cc',
         'output/gl_renderer.h',
         'output/gl_renderer_draw_cache.cc',
         'output/gl_renderer_draw_cache.h',
+        'output/latency_info_swap_promise.cc',
+        'output/latency_info_swap_promise.h',
         'output/managed_memory_policy.cc',
         'output/managed_memory_policy.h',
         'output/output_surface.cc',
         'output/output_surface.h',
         'output/output_surface_client.h',
         'output/overlay_candidate.cc',
         'output/overlay_candidate.h',
         'output/overlay_candidate_validator.h',
         'output/overlay_processor.cc',
         'output/overlay_processor.h',
         'output/overlay_strategy_single_on_top.cc',
         'output/overlay_strategy_single_on_top.h',
         'output/program_binding.cc',
         'output/program_binding.h',
         'output/render_surface_filters.cc',
         'output/render_surface_filters.h',
         'output/renderer.cc',
         'output/renderer.h',
+        'output/renderer_capabilities.cc',
+        'output/renderer_capabilities.h',
         'output/renderer_settings.cc',
         'output/renderer_settings.h',
         'output/shader.cc',
         'output/shader.h',
         'output/software_frame_data.cc',
         'output/software_frame_data.h',
         'output/software_output_device.cc',
         'output/software_output_device.h',
         'output/software_renderer.cc',
         'output/software_renderer.h',
         'output/static_geometry_binding.cc',
         'output/static_geometry_binding.h',
+        'output/swap_promise.h',
         'output/viewport_selection_bound.cc',
         'output/viewport_selection_bound.h',
         'output/vsync_parameter_observer.h',
         'quads/checkerboard_draw_quad.cc',
         'quads/checkerboard_draw_quad.h',
         'quads/content_draw_quad_base.cc',
         'quads/content_draw_quad_base.h',
         'quads/debug_border_draw_quad.cc',
         'quads/debug_border_draw_quad.h',
         'quads/draw_polygon.cc',
@@ skipping 192 matching lines @@
         'scheduler/scheduler_settings.cc',
         'scheduler/scheduler_settings.h',
         'scheduler/scheduler_state_machine.cc',
         'scheduler/scheduler_state_machine.h',
         'trees/blocking_task_runner.cc',
         'trees/blocking_task_runner.h',
         'trees/damage_tracker.cc',
         'trees/damage_tracker.h',
         'trees/draw_property_utils.cc',
         'trees/draw_property_utils.h',
+        'trees/latency_info_swap_promise_monitor.cc',
+        'trees/latency_info_swap_promise_monitor.h',
         'trees/layer_tree_host.cc',
         'trees/layer_tree_host.h',
         'trees/layer_tree_host_client.h',
         'trees/layer_tree_host_common.cc',
         'trees/layer_tree_host_common.h',
         'trees/layer_tree_host_impl.cc',
         'trees/layer_tree_host_impl.h',
         'trees/layer_tree_host_single_thread_client.h',
         'trees/layer_tree_impl.cc',
         'trees/layer_tree_impl.h',
         'trees/layer_tree_settings.cc',
         'trees/layer_tree_settings.h',
         'trees/occlusion.cc',
         'trees/occlusion.h',
         'trees/occlusion_tracker.cc',
         'trees/occlusion_tracker.h',
         'trees/property_tree.cc',
         'trees/property_tree.h',
         'trees/property_tree_builder.cc',
         'trees/property_tree_builder.h',
         'trees/proxy.cc',
         'trees/proxy.h',
         'trees/proxy_timing_history.cc',
         'trees/proxy_timing_history.h',
         'trees/scoped_abort_remaining_swap_promises.h',
         'trees/single_thread_proxy.cc',
         'trees/single_thread_proxy.h',
+        'trees/swap_promise_monitor.cc',
+        'trees/swap_promise_monitor.h',
         'trees/thread_proxy.cc',
         'trees/thread_proxy.h',
         'trees/tree_synchronizer.cc',
         'trees/tree_synchronizer.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
@@ skipping 38 matching lines @@
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }