Part 10 of cc/ directory shuffles: layers

Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681

BUG=190824
TBR=enne@chromium.org, piman@chromium.org, jschuh@chromium.org, joth@chromium.org

Review URL: https://codereview.chromium.org/12916002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188703 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 83 insertions, 83 deletions

diff --git a/cc/trees/damage_tracker.cc b/cc/trees/damage_tracker.cc
index 5187a43..85ccbe4 100644
--- a/cc/trees/damage_tracker.cc
+++ b/cc/trees/damage_tracker.cc
@@ -5,8 +5,8 @@
 #include "cc/trees/damage_tracker.h"
 
 #include "cc/base/math_util.h"
-#include "cc/layer_impl.h"
-#include "cc/render_surface_impl.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/render_surface_impl.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc
index 3d82272..2fc63ce 100644
--- a/cc/trees/damage_tracker_unittest.cc
+++ b/cc/trees/damage_tracker_unittest.cc
@@ -5,7 +5,7 @@
 #include "cc/trees/damage_tracker.h"
 
 #include "cc/base/math_util.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/trees/layer_sorter.cc b/cc/trees/layer_sorter.cc
index 3486180..16b75fa 100644
--- a/cc/trees/layer_sorter.cc
+++ b/cc/trees/layer_sorter.cc
@@ -11,7 +11,7 @@
 
 #include "base/logging.h"
 #include "cc/base/math_util.h"
-#include "cc/render_surface_impl.h"
+#include "cc/layers/render_surface_impl.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
diff --git a/cc/trees/layer_sorter.h b/cc/trees/layer_sorter.h
index 3b3e839..a1a00dd 100644
--- a/cc/trees/layer_sorter.h
+++ b/cc/trees/layer_sorter.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/quad_f.h"
 #include "ui/gfx/rect_f.h"
diff --git a/cc/trees/layer_sorter_unittest.cc b/cc/trees/layer_sorter_unittest.cc
index aacb8ac..73de79c 100644
--- a/cc/trees/layer_sorter_unittest.cc
+++ b/cc/trees/layer_sorter_unittest.cc
@@ -5,7 +5,7 @@
 #include "cc/trees/layer_sorter.h"
 
 #include "cc/base/math_util.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 2de01a5..81ab616 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -16,16 +16,16 @@
 #include "cc/base/switches.h"
 #include "cc/base/thread.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/heads_up_display_layer.h"
-#include "cc/heads_up_display_layer_impl.h"
 #include "cc/input/top_controls_manager.h"
-#include "cc/layer.h"
-#include "cc/layer_iterator.h"
+#include "cc/layers/heads_up_display_layer.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_iterator.h"
+#include "cc/layers/scrollbar_layer.h"
 #include "cc/pinch_zoom_scrollbar.h"
 #include "cc/pinch_zoom_scrollbar_geometry.h"
 #include "cc/pinch_zoom_scrollbar_painter.h"
 #include "cc/resources/prioritized_resource_manager.h"
-#include "cc/scrollbar_layer.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_host_impl.h"
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index 30b8f5f..931b6f9f 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -8,12 +8,12 @@
 
 #include "base/debug/trace_event.h"
 #include "cc/base/math_util.h"
-#include "cc/heads_up_display_layer_impl.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
-#include "cc/layer_iterator.h"
-#include "cc/render_surface.h"
-#include "cc/render_surface_impl.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/layer_iterator.h"
+#include "cc/layers/render_surface.h"
+#include "cc/layers/render_surface_impl.h"
 #include "cc/trees/layer_sorter.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "ui/gfx/point_conversions.h"
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index 8cefb59..dbf7ca6 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -7,11 +7,11 @@
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/base/thread.h"
-#include "cc/content_layer.h"
-#include "cc/content_layer_client.h"
-#include "cc/heads_up_display_layer_impl.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/content_layer_client.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 0a4a584..022fff8 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -13,7 +13,6 @@
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "cc/animation/scrollbar_animation_controller.h"
-#include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
 #include "cc/base/util.h"
 #include "cc/debug/debug_rect_history.h"
@@ -21,10 +20,12 @@
 #include "cc/debug/overdraw_metrics.h"
 #include "cc/debug/paint_time_counter.h"
 #include "cc/debug/rendering_stats.h"
-#include "cc/heads_up_display_layer_impl.h"
 #include "cc/input/page_scale_animation.h"
 #include "cc/input/top_controls_manager.h"
-#include "cc/layer_iterator.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer_iterator.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/delegating_renderer.h"
 #include "cc/output/gl_renderer.h"
@@ -37,7 +38,6 @@
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/scheduler/texture_uploader.h"
-#include "cc/scrollbar_layer_impl.h"
 #include "cc/trees/damage_tracker.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 5c2dc40..e9bd4d4 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -13,10 +13,10 @@
 #include "cc/base/cc_export.h"
 #include "cc/input/input_handler.h"
 #include "cc/input/top_controls_manager_client.h"
+#include "cc/layers/render_pass_sink.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/render_pass.h"
-#include "cc/render_pass_sink.h"
 #include "cc/resources/tile_manager.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 91f7fa0..ad27935 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -10,22 +10,25 @@
 #include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "cc/base/math_util.h"
-#include "cc/delegated_renderer_layer_impl.h"
-#include "cc/heads_up_display_layer_impl.h"
 #include "cc/input/top_controls_manager.h"
-#include "cc/io_surface_layer_impl.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/delegated_renderer_layer_impl.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/io_surface_layer_impl.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/quad_sink.h"
+#include "cc/layers/scrollbar_geometry_fixed_thumb.h"
+#include "cc/layers/scrollbar_layer_impl.h"
+#include "cc/layers/solid_color_layer_impl.h"
+#include "cc/layers/texture_layer_impl.h"
+#include "cc/layers/tiled_layer_impl.h"
+#include "cc/layers/video_layer_impl.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/gl_renderer.h"
-#include "cc/quad_sink.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/resources/layer_tiling_data.h"
-#include "cc/scrollbar_geometry_fixed_thumb.h"
-#include "cc/scrollbar_layer_impl.h"
-#include "cc/solid_color_layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_proxy.h"
@@ -35,11 +38,8 @@
 #include "cc/test/layer_test_common.h"
 #include "cc/test/render_pass_test_common.h"
 #include "cc/test/test_web_graphics_context_3d.h"
-#include "cc/texture_layer_impl.h"
-#include "cc/tiled_layer_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
-#include "cc/video_layer_impl.h"
 #include "media/base/media.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index 495c8bc..ab39cbb 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -8,9 +8,9 @@
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
-#include "cc/content_layer.h"
-#include "cc/nine_patch_layer.h"
-#include "cc/solid_color_layer.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/nine_patch_layer.h"
+#include "cc/layers/solid_color_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/layer_tree_json_parser.h"
 #include "cc/test/layer_tree_test_common.h"
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 97308ea..8cb0b22 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -5,16 +5,16 @@
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/synchronization/lock.h"
-#include "cc/content_layer.h"
-#include "cc/content_layer_client.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/content_layer_client.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/picture_layer.h"
+#include "cc/layers/scrollbar_layer.h"
 #include "cc/output/output_surface.h"
-#include "cc/picture_layer.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource_update_queue.h"
 #include "cc/scheduler/frame_rate_controller.h"
-#include "cc/scrollbar_layer.h"
 #include "cc/test/fake_content_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_layer_tree_host_client.h"
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
index a9430fb..1fffca8 100644
--- a/cc/trees/layer_tree_host_unittest_animation.cc
+++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -6,8 +6,8 @@
 
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/fake_content_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/layer_tree_test_common.h"
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index 386bd854..6ec2534 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -5,12 +5,15 @@
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/basictypes.h"
-#include "cc/content_layer.h"
-#include "cc/heads_up_display_layer.h"
-#include "cc/io_surface_layer.h"
-#include "cc/layer_impl.h"
-#include "cc/picture_layer.h"
-#include "cc/scrollbar_layer.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/heads_up_display_layer.h"
+#include "cc/layers/io_surface_layer.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/picture_layer.h"
+#include "cc/layers/scrollbar_layer.h"
+#include "cc/layers/texture_layer.h"
+#include "cc/layers/video_layer.h"
+#include "cc/layers/video_layer_impl.h"
 #include "cc/test/fake_content_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_content_layer_impl.h"
@@ -26,12 +29,9 @@
 #include "cc/test/layer_tree_test_common.h"
 #include "cc/test/render_pass_test_common.h"
 #include "cc/test/test_web_graphics_context_3d.h"
-#include "cc/texture_layer.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
-#include "cc/video_layer.h"
-#include "cc/video_layer_impl.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "media/base/media.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
index a982f3a..cf81c25 100644
--- a/cc/trees/layer_tree_host_unittest_delegated.cc
+++ b/cc/trees/layer_tree_host_unittest_delegated.cc
@@ -4,8 +4,8 @@
 
 #include "cc/trees/layer_tree_host.h"
 
-#include "cc/delegated_renderer_layer.h"
-#include "cc/delegated_renderer_layer_impl.h"
+#include "cc/layers/delegated_renderer_layer.h"
+#include "cc/layers/delegated_renderer_layer_impl.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/texture_draw_quad.h"
diff --git a/cc/trees/layer_tree_host_unittest_occlusion.cc b/cc/trees/layer_tree_host_unittest_occlusion.cc
index 10a55e4..b62c811 100644
--- a/cc/trees/layer_tree_host_unittest_occlusion.cc
+++ b/cc/trees/layer_tree_host_unittest_occlusion.cc
@@ -4,7 +4,7 @@
 
 #include "cc/trees/layer_tree_host.h"
 
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 #include "cc/test/layer_tree_test_common.h"
 #include "cc/test/occlusion_tracker_test_common.h"
 
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index 0ba3635..09d8fbc5 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -4,9 +4,9 @@
 
 #include "cc/trees/layer_tree_host.h"
 
-#include "cc/content_layer.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test_common.h"
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 7cedbc20..9b5f41d 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -9,10 +9,10 @@
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/scrollbar_animation_controller.h"
-#include "cc/heads_up_display_layer_impl.h"
-#include "cc/layer.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 #include "cc/pinch_zoom_scrollbar.h"
-#include "cc/scrollbar_layer_impl.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "ui/gfx/size_conversions.h"
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
index f72f753..a14541d 100644
--- a/cc/trees/layer_tree_impl.h
+++ b/cc/trees/layer_tree_impl.h
@@ -7,7 +7,7 @@
 
 #include "base/hash_tables.h"
 #include "base/values.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
diff --git a/cc/trees/occlusion_tracker.cc b/cc/trees/occlusion_tracker.cc
index 2a35adc..77b083b 100644
--- a/cc/trees/occlusion_tracker.cc
+++ b/cc/trees/occlusion_tracker.cc
@@ -8,8 +8,8 @@
 
 #include "cc/base/math_util.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "ui/gfx/quad_f.h"
 #include "ui/gfx/rect_conversions.h"
 
diff --git a/cc/trees/occlusion_tracker.h b/cc/trees/occlusion_tracker.h
index 01662ff..f659c31 100644
--- a/cc/trees/occlusion_tracker.h
+++ b/cc/trees/occlusion_tracker.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
-#include "cc/layer_iterator.h"
+#include "cc/layers/layer_iterator.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index 981ddd5..0ec71d1 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -7,8 +7,8 @@
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
diff --git a/cc/trees/quad_culler.cc b/cc/trees/quad_culler.cc
index e65ed02..205f98b 100644
--- a/cc/trees/quad_culler.cc
+++ b/cc/trees/quad_culler.cc
@@ -4,10 +4,10 @@
 
 #include "cc/trees/quad_culler.h"
 
-#include "cc/append_quads_data.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/render_pass.h"
 #include "cc/trees/occlusion_tracker.h"
diff --git a/cc/trees/quad_culler.h b/cc/trees/quad_culler.h
index cadd3da..be0095f 100644
--- a/cc/trees/quad_culler.h
+++ b/cc/trees/quad_culler.h
@@ -6,7 +6,7 @@
 #define CC_TREES_QUAD_CULLER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/quads/render_pass.h"
 
 namespace cc {
diff --git a/cc/trees/quad_culler_unittest.cc b/cc/trees/quad_culler_unittest.cc
index b4e94e7..c7dad79 100644
--- a/cc/trees/quad_culler_unittest.cc
+++ b/cc/trees/quad_culler_unittest.cc
@@ -4,14 +4,14 @@
 
 #include "cc/trees/quad_culler.h"
 
-#include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/overdraw_metrics.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/tiled_layer_impl.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/resources/layer_tiling_data.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
-#include "cc/tiled_layer_impl.h"
 #include "cc/trees/occlusion_tracker.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/trees/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc
index ce071f2..5bbfca6 100644
--- a/cc/trees/tree_synchronizer.cc
+++ b/cc/trees/tree_synchronizer.cc
@@ -7,10 +7,10 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "cc/animation/scrollbar_animation_controller.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
-#include "cc/scrollbar_layer.h"
-#include "cc/scrollbar_layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/scrollbar_layer.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/trees/tree_synchronizer_unittest.cc b/cc/trees/tree_synchronizer_unittest.cc
index 8629f3d..3b1632c 100644
--- a/cc/trees/tree_synchronizer_unittest.cc
+++ b/cc/trees/tree_synchronizer_unittest.cc
@@ -7,8 +7,8 @@
 #include <algorithm>
 
 #include "cc/animation/layer_animation_controller.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"