Update from https://crrev.com/317530

cc/cc.gyp

Index: cc/cc.gyp
diff --git a/cc/cc.gyp b/cc/cc.gyp
index d04b51ca957073d7b9538bf0839eb2cd2af8e2e4..84a0930cf5b02118e7b60f3b0b3f8d995f322c08 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -52,8 +52,8 @@
         'animation/layer_animation_value_provider.h',
         'animation/scroll_offset_animation_curve.cc',
         'animation/scroll_offset_animation_curve.h',
-        'animation/scrollbar_animation_controller.h',
         'animation/scrollbar_animation_controller.cc',
+        'animation/scrollbar_animation_controller.h',
         'animation/scrollbar_animation_controller_linear_fade.cc',
         'animation/scrollbar_animation_controller_linear_fade.h',
         'animation/scrollbar_animation_controller_thinning.cc',
@@ -88,9 +88,9 @@
         'base/swap_promise.h',
         'base/swap_promise_monitor.cc',
         'base/swap_promise_monitor.h',
-        'base/synced_property.h',
         'base/switches.cc',
         'base/switches.h',
+        'base/synced_property.h',
         'base/tiling_data.cc',
         'base/tiling_data.h',
         'base/time_util.h',
@@ -120,12 +120,12 @@
         'debug/layer_tree_debug_state.h',
         'debug/micro_benchmark.cc',
         'debug/micro_benchmark.h',
-        'debug/micro_benchmark_impl.cc',
-        'debug/micro_benchmark_impl.h',
         'debug/micro_benchmark_controller.cc',
         'debug/micro_benchmark_controller.h',
         'debug/micro_benchmark_controller_impl.cc',
         'debug/micro_benchmark_controller_impl.h',
+        'debug/micro_benchmark_impl.cc',
+        'debug/micro_benchmark_impl.h',
         'debug/paint_time_counter.cc',
         'debug/paint_time_counter.h',
         'debug/picture_debug_util.cc',
@@ -151,10 +151,10 @@
         '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/page_scale_animation.cc',
+        'input/page_scale_animation.h',
         'input/scroll_elasticity_helper.cc',
         'input/scroll_elasticity_helper.h',
         'input/selection_bound_type.h',
@@ -273,8 +273,8 @@
         'output/copy_output_request.h',
         'output/copy_output_result.cc',
         'output/copy_output_result.h',
-        'output/delegated_frame_data.h',
         'output/delegated_frame_data.cc',
+        'output/delegated_frame_data.h',
         'output/delegating_renderer.cc',
         'output/delegating_renderer.h',
         'output/direct_renderer.cc',
@@ -285,8 +285,8 @@
         'output/filter_operations.h',
         'output/geometry_binding.cc',
         'output/geometry_binding.h',
-        'output/gl_frame_data.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',
@@ -334,8 +334,8 @@
         'quads/draw_quad.h',
         'quads/io_surface_draw_quad.cc',
         'quads/io_surface_draw_quad.h',
-        'quads/largest_draw_quad.h',
         'quads/largest_draw_quad.cc',
+        'quads/largest_draw_quad.h',
         'quads/list_container.cc',
         'quads/list_container.h',
         'quads/picture_draw_quad.cc',
@@ -362,10 +362,10 @@
         '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/bitmap_tile_task_worker_pool.cc',
+        'resources/bitmap_tile_task_worker_pool.h',
         'resources/clip_display_item.cc',
         'resources/clip_display_item.h',
         'resources/clip_path_display_item.cc',
@@ -429,19 +429,13 @@
         'resources/raster_source.h',
         'resources/raster_source_helper.cc',
         'resources/raster_source_helper.h',
+        'resources/raster_tile_priority_queue.cc',
+        'resources/raster_tile_priority_queue.h',
         'resources/raster_tile_priority_queue_all.cc',
         'resources/raster_tile_priority_queue_all.h',
         'resources/raster_tile_priority_queue_required.cc',
         'resources/raster_tile_priority_queue_required.h',
-        'resources/raster_tile_priority_queue.cc',
-        'resources/raster_tile_priority_queue.h',
         'resources/rasterizer.h',
-        'resources/software_rasterizer.cc',
-        'resources/software_rasterizer.h',
-        'resources/tile_task_worker_pool.cc',
-        'resources/tile_task_worker_pool.h',
-        'resources/tile_task_runner.cc',
-        'resources/tile_task_runner.h',
         'resources/recording_source.h',
         'resources/release_callback.h',
         'resources/resource.cc',
@@ -474,6 +468,8 @@
         'resources/single_release_callback_impl.h',
         'resources/skpicture_content_layer_updater.cc',
         'resources/skpicture_content_layer_updater.h',
+        'resources/software_rasterizer.cc',
+        'resources/software_rasterizer.h',
         'resources/task_graph_runner.cc',
         'resources/task_graph_runner.h',
         'resources/texture_mailbox.cc',
@@ -490,6 +486,10 @@
         'resources/tile_manager.h',
         'resources/tile_priority.cc',
         'resources/tile_priority.h',
+        'resources/tile_task_runner.cc',
+        'resources/tile_task_runner.h',
+        'resources/tile_task_worker_pool.cc',
+        'resources/tile_task_worker_pool.h',
         'resources/tiling_set_eviction_queue.cc',
         'resources/tiling_set_eviction_queue.h',
         'resources/tiling_set_raster_queue_all.cc',
@@ -595,14 +595,14 @@
         'surfaces/surface.h',
         'surfaces/surface_aggregator.cc',
         'surfaces/surface_aggregator.h',
+        'surfaces/surface_display_output_surface.cc',
+        'surfaces/surface_display_output_surface.h',
         'surfaces/surface_factory.cc',
         'surfaces/surface_factory.h',
         'surfaces/surface_factory_client.h',
         'surfaces/surface_id.h',
         'surfaces/surface_id_allocator.cc',
         'surfaces/surface_id_allocator.h',
-        'surfaces/surface_display_output_surface.cc',
-        'surfaces/surface_display_output_surface.h',
         'surfaces/surface_manager.cc',
         'surfaces/surface_manager.h',
         'surfaces/surface_resource_holder.cc',