From 39cb4ed726c25fd55e034b2545daba9003193962 Mon Sep 17 00:00:00 2001 From: gab Date: Wed, 11 May 2016 10:45:19 -0700 Subject: [PATCH] Fix include path for moved thread_task_runner_handle.h header in cc/ BUG=610438 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel TBR=enne@chromium.org Review-Url: https://codereview.chromium.org/1971783002 Cr-Commit-Position: refs/heads/master@{#392979} --- cc/animation/animation_host_perftest.cc | 2 +- cc/base/unique_notifier_unittest.cc | 2 +- cc/debug/micro_benchmark_controller.cc | 2 +- cc/layers/layer_perftest.cc | 2 +- cc/layers/layer_unittest.cc | 2 +- cc/layers/picture_image_layer_impl_unittest.cc | 2 +- cc/layers/picture_layer_impl_perftest.cc | 2 +- cc/layers/picture_layer_impl_unittest.cc | 2 +- cc/layers/picture_layer_unittest.cc | 2 +- cc/layers/scrollbar_layer_unittest.cc | 2 +- cc/layers/surface_layer_unittest.cc | 2 +- cc/layers/texture_layer_unittest.cc | 2 +- cc/layers/ui_resource_layer_unittest.cc | 2 +- cc/output/gl_renderer_unittest.cc | 2 +- cc/output/output_surface.cc | 2 +- cc/output/texture_mailbox_deleter_unittest.cc | 2 +- cc/playback/raster_source.cc | 2 +- cc/raster/raster_buffer_provider_unittest.cc | 2 +- cc/raster/staging_buffer_pool.cc | 2 +- cc/resources/resource_pool.cc | 2 +- cc/resources/resource_pool_unittest.cc | 2 +- cc/resources/resource_provider.cc | 2 +- cc/resources/video_resource_updater.cc | 2 +- cc/surfaces/display.cc | 2 +- cc/test/fake_external_begin_frame_source.cc | 2 +- cc/test/fake_impl_task_runner_provider.h | 2 +- cc/test/fake_picture_layer_tiling_client.cc | 2 +- cc/test/fake_tile_manager.cc | 2 +- cc/test/layer_tree_test.cc | 2 +- cc/test/pixel_test.cc | 2 +- cc/test/test_context_support.cc | 2 +- cc/tiles/gpu_image_decode_controller.cc | 2 +- cc/tiles/software_image_decode_controller.cc | 2 +- cc/tiles/tile_manager_perftest.cc | 2 +- cc/tiles/tile_manager_unittest.cc | 2 +- cc/trees/blocking_task_runner_unittest.cc | 2 +- cc/trees/layer_tree_host.cc | 2 +- cc/trees/layer_tree_host_impl_unittest.cc | 2 +- cc/trees/layer_tree_host_unittest.cc | 2 +- cc/trees/layer_tree_host_unittest_remote_server.cc | 2 +- cc/trees/layer_tree_host_unittest_scroll.cc | 2 +- cc/trees/occlusion_tracker_perftest.cc | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/cc/animation/animation_host_perftest.cc b/cc/animation/animation_host_perftest.cc index 5003533d9bb06d..32b999b69f5b5e 100644 --- a/cc/animation/animation_host_perftest.cc +++ b/cc/animation/animation_host_perftest.cc @@ -4,7 +4,7 @@ #include "cc/animation/animation_host.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/animation/animation_id_provider.h" #include "cc/animation/animation_player.h" #include "cc/animation/animation_timeline.h" diff --git a/cc/base/unique_notifier_unittest.cc b/cc/base/unique_notifier_unittest.cc index b53b52a76fd883..2c5475881989a1 100644 --- a/cc/base/unique_notifier_unittest.cc +++ b/cc/base/unique_notifier_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind_helpers.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/base/unique_notifier.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/debug/micro_benchmark_controller.cc b/cc/debug/micro_benchmark_controller.cc index 54d33c9ab19a84..0707563612ddf3 100644 --- a/cc/debug/micro_benchmark_controller.cc +++ b/cc/debug/micro_benchmark_controller.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/memory/ptr_util.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/values.h" #include "cc/debug/invalidation_benchmark.h" #include "cc/debug/rasterize_and_record_benchmark.h" diff --git a/cc/layers/layer_perftest.cc b/cc/layers/layer_perftest.cc index 237d7cf6eb9535..0d2e4a146b2ac7 100644 --- a/cc/layers/layer_perftest.cc +++ b/cc/layers/layer_perftest.cc @@ -4,7 +4,7 @@ #include "cc/layers/layer.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/debug/lap_timer.h" #include "cc/test/fake_impl_task_runner_provider.h" #include "cc/test/fake_layer_tree_host.h" diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc index dd5bc1515b4d2c..caec92e5ec26bf 100644 --- a/cc/layers/layer_unittest.cc +++ b/cc/layers/layer_unittest.cc @@ -6,7 +6,7 @@ #include -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/animation/animation_host.h" #include "cc/animation/animation_id_provider.h" #include "cc/animation/keyframed_animation_curve.h" diff --git a/cc/layers/picture_image_layer_impl_unittest.cc b/cc/layers/picture_image_layer_impl_unittest.cc index 35dd44ba5a2c01..9027d4a6eae9f4 100644 --- a/cc/layers/picture_image_layer_impl_unittest.cc +++ b/cc/layers/picture_image_layer_impl_unittest.cc @@ -5,7 +5,7 @@ #include "cc/layers/picture_image_layer_impl.h" #include "base/memory/ptr_util.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/layers/append_quads_data.h" #include "cc/quads/draw_quad.h" #include "cc/test/fake_impl_task_runner_provider.h" diff --git a/cc/layers/picture_layer_impl_perftest.cc b/cc/layers/picture_layer_impl_perftest.cc index 046c921b456dc7..807b06309739ae 100644 --- a/cc/layers/picture_layer_impl_perftest.cc +++ b/cc/layers/picture_layer_impl_perftest.cc @@ -5,7 +5,7 @@ #include "cc/layers/picture_layer_impl.h" #include "base/macros.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/debug/lap_timer.h" #include "cc/test/fake_impl_task_runner_provider.h" #include "cc/test/fake_layer_tree_host_impl.h" diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index f41be32906cd85..8b1552e6c3e20a 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc @@ -13,7 +13,7 @@ #include "base/location.h" #include "base/macros.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/base/math_util.h" #include "cc/layers/append_quads_data.h" #include "cc/layers/picture_layer.h" diff --git a/cc/layers/picture_layer_unittest.cc b/cc/layers/picture_layer_unittest.cc index 9d6b63f0916978..5394672b1faedf 100644 --- a/cc/layers/picture_layer_unittest.cc +++ b/cc/layers/picture_layer_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/memory/ptr_util.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/layers/append_quads_data.h" #include "cc/layers/content_layer_client.h" #include "cc/layers/empty_content_layer_client.h" diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc index 9cb53a8fbe24b7..36e42daab2ef9c 100644 --- a/cc/layers/scrollbar_layer_unittest.cc +++ b/cc/layers/scrollbar_layer_unittest.cc @@ -6,7 +6,7 @@ #include -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/input/scrollbar_animation_controller.h" #include "cc/layers/append_quads_data.h" #include "cc/layers/painted_scrollbar_layer.h" diff --git a/cc/layers/surface_layer_unittest.cc b/cc/layers/surface_layer_unittest.cc index 028be56b21d52d..b7db7abd6414c3 100644 --- a/cc/layers/surface_layer_unittest.cc +++ b/cc/layers/surface_layer_unittest.cc @@ -9,7 +9,7 @@ #include "base/location.h" #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/layers/solid_color_layer.h" #include "cc/layers/surface_layer.h" #include "cc/test/fake_impl_task_runner_provider.h" diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc index 3f354274ba3535..5eda9bbd962099 100644 --- a/cc/layers/texture_layer_unittest.cc +++ b/cc/layers/texture_layer_unittest.cc @@ -18,8 +18,8 @@ #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "cc/layers/solid_color_layer.h" #include "cc/layers/texture_layer_client.h" diff --git a/cc/layers/ui_resource_layer_unittest.cc b/cc/layers/ui_resource_layer_unittest.cc index a91d676d96a753..7163828d6090c8 100644 --- a/cc/layers/ui_resource_layer_unittest.cc +++ b/cc/layers/ui_resource_layer_unittest.cc @@ -4,7 +4,7 @@ #include "cc/layers/ui_resource_layer.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/resources/resource_provider.h" #include "cc/resources/scoped_ui_resource.h" #include "cc/test/fake_layer_tree_host.h" diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc index 1025ace562d812..65724fbc9e3806 100644 --- a/cc/output/gl_renderer_unittest.cc +++ b/cc/output/gl_renderer_unittest.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/memory/ptr_util.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/base/math_util.h" #include "cc/output/compositor_frame_metadata.h" #include "cc/output/copy_output_request.h" diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc index a2834e181ce5c0..3e1549701e9ba6 100644 --- a/cc/output/output_surface.cc +++ b/cc/output/output_surface.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/macros.h" #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h" #include "cc/output/managed_memory_policy.h" #include "cc/output/output_surface_client.h" diff --git a/cc/output/texture_mailbox_deleter_unittest.cc b/cc/output/texture_mailbox_deleter_unittest.cc index 3bf239bbb4a9a5..205aede2d513eb 100644 --- a/cc/output/texture_mailbox_deleter_unittest.cc +++ b/cc/output/texture_mailbox_deleter_unittest.cc @@ -5,7 +5,7 @@ #include "cc/output/texture_mailbox_deleter.h" #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/resources/single_release_callback.h" #include "cc/test/test_context_provider.h" #include "cc/test/test_web_graphics_context_3d.h" diff --git a/cc/playback/raster_source.cc b/cc/playback/raster_source.cc index 7f80f9ac8db6f7..23ff23df1e2de2 100644 --- a/cc/playback/raster_source.cc +++ b/cc/playback/raster_source.cc @@ -7,7 +7,7 @@ #include #include "base/strings/stringprintf.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/trace_event.h" #include "cc/base/region.h" diff --git a/cc/raster/raster_buffer_provider_unittest.cc b/cc/raster/raster_buffer_provider_unittest.cc index 6890dd24d8da4e..ffdb710b0e43df 100644 --- a/cc/raster/raster_buffer_provider_unittest.cc +++ b/cc/raster/raster_buffer_provider_unittest.cc @@ -16,7 +16,7 @@ #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/base/unique_notifier.h" #include "cc/raster/bitmap_raster_buffer_provider.h" #include "cc/raster/gpu_raster_buffer_provider.h" diff --git a/cc/raster/staging_buffer_pool.cc b/cc/raster/staging_buffer_pool.cc index 43239c5392a42f..cb14f8224ba83d 100644 --- a/cc/raster/staging_buffer_pool.cc +++ b/cc/raster/staging_buffer_pool.cc @@ -8,7 +8,7 @@ #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/memory_dump_manager.h" #include "cc/base/container_util.h" #include "cc/debug/traced_value.h" diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc index af5b2403199e57..38ec99d227ece7 100644 --- a/cc/resources/resource_pool.cc +++ b/cc/resources/resource_pool.cc @@ -12,7 +12,7 @@ #include "base/format_macros.h" #include "base/strings/stringprintf.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/memory_dump_manager.h" #include "cc/base/container_util.h" #include "cc/resources/resource_provider.h" diff --git a/cc/resources/resource_pool_unittest.cc b/cc/resources/resource_pool_unittest.cc index ec82b56af6fd2c..d9025c621b11f9 100644 --- a/cc/resources/resource_pool_unittest.cc +++ b/cc/resources/resource_pool_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/run_loop.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/resources/resource_util.h" #include "cc/resources/scoped_resource.h" #include "cc/test/fake_output_surface.h" diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc index 0043ea696b73f5..7b77b989109d10 100644 --- a/cc/resources/resource_provider.cc +++ b/cc/resources/resource_provider.cc @@ -19,7 +19,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/trace_event.h" #include "cc/resources/platform_color.h" diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc index 16392fc4f0c674..e74383ea753bcd 100644 --- a/cc/resources/video_resource_updater.cc +++ b/cc/resources/video_resource_updater.cc @@ -26,7 +26,7 @@ #if DCHECK_IS_ON() #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #endif namespace cc { diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc index f40b7dcb35d4e6..51e99210428c8e 100644 --- a/cc/surfaces/display.cc +++ b/cc/surfaces/display.cc @@ -6,7 +6,7 @@ #include -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h" #include "cc/debug/benchmark_instrumentation.h" #include "cc/output/compositor_frame.h" diff --git a/cc/test/fake_external_begin_frame_source.cc b/cc/test/fake_external_begin_frame_source.cc index fee842b2560416..7dc4bef3073e4b 100644 --- a/cc/test/fake_external_begin_frame_source.cc +++ b/cc/test/fake_external_begin_frame_source.cc @@ -6,7 +6,7 @@ #include "base/location.h" #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "cc/test/begin_frame_args_test.h" diff --git a/cc/test/fake_impl_task_runner_provider.h b/cc/test/fake_impl_task_runner_provider.h index 49ddcaadb258c7..2a6b8d6d2ef520 100644 --- a/cc/test/fake_impl_task_runner_provider.h +++ b/cc/test/fake_impl_task_runner_provider.h @@ -5,7 +5,7 @@ #ifndef CC_TEST_FAKE_IMPL_TASK_RUNNER_PROVIDER_H_ #define CC_TEST_FAKE_IMPL_TASK_RUNNER_PROVIDER_H_ -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/trees/single_thread_proxy.h" #include "cc/trees/task_runner_provider.h" diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc index 06d780e21cb52a..ae44a0442dc6cb 100644 --- a/cc/test/fake_picture_layer_tiling_client.cc +++ b/cc/test/fake_picture_layer_tiling_client.cc @@ -8,7 +8,7 @@ #include -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/test/fake_raster_source.h" #include "cc/test/fake_tile_manager.h" diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc index 768e518052631a..6c4554bf2d180b 100644 --- a/cc/test/fake_tile_manager.cc +++ b/cc/test/fake_tile_manager.cc @@ -11,7 +11,7 @@ #include #include "base/lazy_instance.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/raster/raster_buffer.h" #include "cc/test/fake_tile_task_manager.h" diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index 7275ec3a70a98d..08d80a74da20e6 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -8,7 +8,7 @@ #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/animation/animation.h" #include "cc/animation/animation_host.h" #include "cc/animation/element_animations.h" diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc index 8c56f88f09b6c7..8faa02f529b236 100644 --- a/cc/test/pixel_test.cc +++ b/cc/test/pixel_test.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/base/switches.h" #include "cc/output/compositor_frame_metadata.h" #include "cc/output/copy_output_request.h" diff --git a/cc/test/test_context_support.cc b/cc/test/test_context_support.cc index b90c47b848802d..a6aa09ce38c664 100644 --- a/cc/test/test_context_support.cc +++ b/cc/test/test_context_support.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" namespace cc { diff --git a/cc/tiles/gpu_image_decode_controller.cc b/cc/tiles/gpu_image_decode_controller.cc index b7dbd55f116d19..3da71fdd77007b 100644 --- a/cc/tiles/gpu_image_decode_controller.cc +++ b/cc/tiles/gpu_image_decode_controller.cc @@ -8,7 +8,7 @@ #include "base/memory/ptr_util.h" #include "base/numerics/safe_math.h" #include "base/strings/stringprintf.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/debug/devtools_instrumentation.h" #include "cc/output/context_provider.h" #include "cc/raster/tile_task.h" diff --git a/cc/tiles/software_image_decode_controller.cc b/cc/tiles/software_image_decode_controller.cc index 95c2d7b1ed2328..e3c188d94398a5 100644 --- a/cc/tiles/software_image_decode_controller.cc +++ b/cc/tiles/software_image_decode_controller.cc @@ -15,7 +15,7 @@ #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/memory_dump_manager.h" #include "cc/debug/devtools_instrumentation.h" #include "cc/raster/tile_task.h" diff --git a/cc/tiles/tile_manager_perftest.cc b/cc/tiles/tile_manager_perftest.cc index 134ec374af2f38..5d7a03e40f42b2 100644 --- a/cc/tiles/tile_manager_perftest.cc +++ b/cc/tiles/tile_manager_perftest.cc @@ -7,7 +7,7 @@ #include "base/lazy_instance.h" #include "base/location.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "cc/debug/lap_timer.h" #include "cc/raster/raster_buffer.h" diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc index e316180dc8a01f..dd2f5d3da5a211 100644 --- a/cc/tiles/tile_manager_unittest.cc +++ b/cc/tiles/tile_manager_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/playback/raster_source.h" #include "cc/playback/recording_source.h" #include "cc/raster/raster_buffer.h" diff --git a/cc/trees/blocking_task_runner_unittest.cc b/cc/trees/blocking_task_runner_unittest.cc index 86bde3dc23512c..03b9fae9c63406 100644 --- a/cc/trees/blocking_task_runner_unittest.cc +++ b/cc/trees/blocking_task_runner_unittest.cc @@ -8,7 +8,7 @@ #include "base/location.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/test/ordered_simple_task_runner.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc index fefb054818e4dc..a06ea9e9d9d55b 100644 --- a/cc/trees/layer_tree_host.cc +++ b/cc/trees/layer_tree_host.cc @@ -22,7 +22,7 @@ #include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event_argument.h" #include "cc/animation/animation_events.h" diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index 5f3e847ca82643..d7c5d19bcfd9e3 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc @@ -14,7 +14,7 @@ #include "base/command_line.h" #include "base/location.h" #include "base/memory/ptr_util.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/animation/animation_events.h" #include "cc/animation/animation_host.h" #include "cc/animation/animation_id_provider.h" diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index b09435df0aa87b..fa39d5f7b7f794 100644 --- a/cc/trees/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/ptr_util.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/animation/timing_function.h" #include "cc/debug/frame_rate_counter.h" #include "cc/input/scroll_elasticity_helper.h" diff --git a/cc/trees/layer_tree_host_unittest_remote_server.cc b/cc/trees/layer_tree_host_unittest_remote_server.cc index fedc1149ec2946..0c633d1d82ffb4 100644 --- a/cc/trees/layer_tree_host_unittest_remote_server.cc +++ b/cc/trees/layer_tree_host_unittest_remote_server.cc @@ -5,7 +5,7 @@ #include #include "base/memory/ptr_util.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/test/fake_image_serialization_processor.h" #include "cc/test/test_task_graph_runner.h" #include "cc/trees/layer_tree_host.h" diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc index ca83ded86a3dd6..ddc5507a27cc4a 100644 --- a/cc/trees/layer_tree_host_unittest_scroll.cc +++ b/cc/trees/layer_tree_host_unittest_scroll.cc @@ -7,7 +7,7 @@ #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "cc/input/main_thread_scrolling_reason.h" #include "cc/layers/layer.h" #include "cc/layers/layer_impl.h" diff --git a/cc/trees/occlusion_tracker_perftest.cc b/cc/trees/occlusion_tracker_perftest.cc index 1d5858c2c30b15..35c30e15d7e161 100644 --- a/cc/trees/occlusion_tracker_perftest.cc +++ b/cc/trees/occlusion_tracker_perftest.cc @@ -6,7 +6,7 @@ #include -#include "base/thread_task_runner_handle.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "cc/debug/lap_timer.h" #include "cc/layers/layer_iterator.h"