Update from https://crrev.com/304121

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 74 matching lines @@
         '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/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',
         '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',
@@ skipping 28 matching lines @@
         'debug/rendering_stats_instrumentation.h',
         'debug/ring_buffer.h',
         'debug/traced_picture.cc',
         'debug/traced_picture.h',
         'debug/traced_value.cc',
         'debug/traced_value.h',
         'debug/unittest_only_benchmark.cc',
         'debug/unittest_only_benchmark.h',
         'debug/unittest_only_benchmark_impl.cc',
         'debug/unittest_only_benchmark_impl.h',
+        'input/input_handler.cc',
         'input/input_handler.h',
         'input/page_scale_animation.cc',
         'input/page_scale_animation.h',
         'input/layer_selection_bound.cc',
         'input/layer_selection_bound.h',
+        'input/scroll_elasticity_helper.cc',
+        'input/scroll_elasticity_helper.h',
         'input/selection_bound_type.h',
         'input/top_controls_manager.cc',
         'input/top_controls_manager.h',
         'input/top_controls_manager_client.h',
         'layers/append_quads_data.h',
         'layers/content_layer.cc',
         'layers/content_layer.h',
         'layers/content_layer_client.h',
         'layers/contents_scaling_layer.cc',
         'layers/contents_scaling_layer.h',
@@ skipping 216 matching lines @@
         'resources/one_copy_raster_worker_pool.cc',
         'resources/one_copy_raster_worker_pool.h',
         'resources/picture.cc',
         'resources/picture.h',
         'resources/picture_layer_tiling.cc',
         'resources/picture_layer_tiling.h',
         'resources/picture_layer_tiling_set.cc',
         'resources/picture_layer_tiling_set.h',
         'resources/picture_pile.cc',
         'resources/picture_pile.h',
-        'resources/picture_pile_base.cc',
-        'resources/picture_pile_base.h',
         'resources/picture_pile_impl.cc',
         'resources/picture_pile_impl.h',
         'resources/pixel_buffer_raster_worker_pool.cc',
         'resources/pixel_buffer_raster_worker_pool.h',
         'resources/platform_color.h',
         'resources/prioritized_resource.cc',
         'resources/prioritized_resource.h',
         'resources/prioritized_resource_manager.cc',
         'resources/prioritized_resource_manager.h',
         'resources/priority_calculator.cc',
         'resources/priority_calculator.h',
         'resources/raster_buffer.cc',
         'resources/raster_buffer.h',
         'resources/raster_source.h',
         'resources/raster_tile_priority_queue.cc',
         'resources/raster_tile_priority_queue.h',
         'resources/raster_worker_pool.cc',
         'resources/raster_worker_pool.h',
         'resources/rasterizer.cc',
         'resources/rasterizer.h',
+        'resources/recording_source.h',
         'resources/release_callback.h',
         'resources/resource.cc',
         'resources/resource.h',
         'resources/resource_format.cc',
         'resources/resource_format.h',
         'resources/resource_pool.cc',
         'resources/resource_pool.h',
         'resources/resource_provider.cc',
         'resources/resource_provider.h',
         'resources/resource_update.cc',
@@ skipping 129 matching lines @@
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }