Part 11 of cc/ directory shuffles: fix up stragglers

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

This moves files left behind in previous patches and completes the series.

BUG=190824
TBR=enne@chromium.org

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

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

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

37 files changed, 74 insertions, 74 deletions

diff --git a/cc/animation/keyframed_animation_curve.h b/cc/animation/keyframed_animation_curve.h
index aa53b67..09f269c 100644
--- a/cc/animation/keyframed_animation_curve.h
+++ b/cc/animation/keyframed_animation_curve.h
@@ -6,10 +6,10 @@
 #define CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_
 
 #include "cc/animation/animation_curve.h"
+#include "cc/animation/timing_function.h"
+#include "cc/animation/transform_operations.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
-#include "cc/timing_function.h"
-#include "cc/transform_operations.h"
 
 namespace cc {
 
diff --git a/cc/animation/keyframed_animation_curve_unittest.cc b/cc/animation/keyframed_animation_curve_unittest.cc
index 446801d..dd7f869 100644
--- a/cc/animation/keyframed_animation_curve_unittest.cc
+++ b/cc/animation/keyframed_animation_curve_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "cc/animation/keyframed_animation_curve.h"
 
-#include "cc/transform_operations.h"
+#include "cc/animation/transform_operations.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/animation/layer_animation_controller_unittest.cc b/cc/animation/layer_animation_controller_unittest.cc
index 2e7c29b..d7ecf9f 100644
--- a/cc/animation/layer_animation_controller_unittest.cc
+++ b/cc/animation/layer_animation_controller_unittest.cc
@@ -7,8 +7,8 @@
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/keyframed_animation_curve.h"
+#include "cc/animation/transform_operations.h"
 #include "cc/test/animation_test_common.h"
-#include "cc/transform_operations.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/transform.h"
diff --git a/cc/timing_function.cc b/cc/animation/timing_function.cc
index 4ea34f8..c0af3c2 100644
--- a/cc/timing_function.cc
+++ b/cc/animation/timing_function.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/timing_function.h"
+#include "cc/animation/timing_function.h"
 
 #include "third_party/skia/include/core/SkMath.h"
 
diff --git a/cc/timing_function.h b/cc/animation/timing_function.h
index 529fdce..3c88ecb 100644
--- a/cc/timing_function.h
+++ b/cc/animation/timing_function.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_TIMING_FUNCTION_H_
-#define CC_TIMING_FUNCTION_H_
+#ifndef CC_ANIMATION_TIMING_FUNCTION_H_
+#define CC_ANIMATION_TIMING_FUNCTION_H_
 
 #include "cc/animation/animation_curve.h"
 #include "cc/base/cc_export.h"
@@ -64,4 +64,4 @@ class CC_EXPORT EaseInOutTimingFunction {
 
 }  // namespace cc
 
-#endif  // CC_TIMING_FUNCTION_H_
+#endif  // CC_ANIMATION_TIMING_FUNCTION_H_
diff --git a/cc/timing_function_unittest.cc b/cc/animation/timing_function_unittest.cc
index 6a4cfe0..f97201b 100644
--- a/cc/timing_function_unittest.cc
+++ b/cc/animation/timing_function_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/timing_function.h"
+#include "cc/animation/timing_function.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/transform_operation.cc b/cc/animation/transform_operation.cc
index 2c3b632..65769b4 100644
--- a/cc/transform_operation.cc
+++ b/cc/animation/transform_operation.cc
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <limits>
 
-#include "cc/transform_operation.h"
+#include "cc/animation/transform_operation.h"
 #include "ui/gfx/vector3d_f.h"
 
 namespace {
diff --git a/cc/transform_operation.h b/cc/animation/transform_operation.h
index 818914e..0581862 100644
--- a/cc/transform_operation.h
+++ b/cc/animation/transform_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_TRANSFORM_OPERATION_H_
-#define CC_TRANSFORM_OPERATION_H
+#ifndef CC_ANIMATION_TRANSFORM_OPERATION_H_
+#define CC_ANIMATION_TRANSFORM_OPERATION_H_
 
 #include "ui/gfx/transform.h"
 
@@ -60,4 +60,4 @@ struct TransformOperation {
 
 }  // namespace cc
 
-#endif  // CC_TRANSFORM_OPERATION_H_
+#endif  // CC_ANIMATION_TRANSFORM_OPERATION_H_
diff --git a/cc/transform_operations.cc b/cc/animation/transform_operations.cc
index 22054bd..4de283e 100644
--- a/cc/transform_operations.cc
+++ b/cc/animation/transform_operations.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/transform_operations.h"
+#include "cc/animation/transform_operations.h"
 #include "ui/gfx/transform_util.h"
 #include "ui/gfx/vector3d_f.h"
 
diff --git a/cc/transform_operations.h b/cc/animation/transform_operations.h
index c34d845..9ab0196 100644
--- a/cc/transform_operations.h
+++ b/cc/animation/transform_operations.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_TRANSFORM_OPERATIONS_H_
-#define CC_TRANSFORM_OPERATIONS_H_
+#ifndef CC_ANIMATION_TRANSFORM_OPERATIONS_H_
+#define CC_ANIMATION_TRANSFORM_OPERATIONS_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "cc/animation/transform_operation.h"
 #include "cc/base/cc_export.h"
-#include "cc/transform_operation.h"
 #include "ui/gfx/transform.h"
 
 namespace gfx {
@@ -78,4 +78,4 @@ class CC_EXPORT TransformOperations {
 
 }  // namespace cc
 
-#endif  // CC_TRANSFORM_OPERATIONS_H_
+#endif  // CC_ANIMATION_TRANSFORM_OPERATIONS_H_
diff --git a/cc/transform_operations_unittest.cc b/cc/animation/transform_operations_unittest.cc
index 245777f..206a9f6 100644
--- a/cc/transform_operations_unittest.cc
+++ b/cc/animation/transform_operations_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_vector.h"
+#include "cc/animation/transform_operations.h"
 #include "cc/test/geometry_test_utils.h"
-#include "cc/transform_operations.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/vector3d_f.h"
 
diff --git a/cc/cc.gyp b/cc/cc.gyp
index a934729..65c2de7 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -94,7 +94,7 @@
       'layers/io_surface_layer_impl.h',
       'animation/keyframed_animation_curve.cc',
       'animation/keyframed_animation_curve.h',
-      'latency_info.h',
+      'debug/latency_info.h',
       'layers/layer.cc',
       'layers/layer.h',
       'animation/layer_animation_controller.cc',
@@ -129,8 +129,8 @@
       'resources/layer_updater.h',
       'resources/managed_memory_policy.cc',
       'resources/managed_memory_policy.h',
-      'managed_tile_state.cc',
-      'managed_tile_state.h',
+      'resources/managed_tile_state.cc',
+      'resources/managed_tile_state.h',
       'base/math_util.cc',
       'base/math_util.h',
       'resources/memory_history.cc',
@@ -170,12 +170,12 @@
       'resources/picture_pile_base.h',
       'resources/picture_pile_impl.cc',
       'resources/picture_pile_impl.h',
-      'pinch_zoom_scrollbar.cc',
-      'pinch_zoom_scrollbar.h',
-      'pinch_zoom_scrollbar_geometry.cc',
-      'pinch_zoom_scrollbar_geometry.h',
-      'pinch_zoom_scrollbar_painter.cc',
-      'pinch_zoom_scrollbar_painter.h',
+      'input/pinch_zoom_scrollbar.cc',
+      'input/pinch_zoom_scrollbar.h',
+      'input/pinch_zoom_scrollbar_geometry.cc',
+      'input/pinch_zoom_scrollbar_geometry.h',
+      'input/pinch_zoom_scrollbar_painter.cc',
+      'input/pinch_zoom_scrollbar_painter.h',
       'resources/platform_color.h',
       'resources/prioritized_resource.cc',
       'resources/prioritized_resource.h',
@@ -305,17 +305,17 @@
       'base/tiling_data.cc',
       'base/tiling_data.h',
       'scheduler/time_source.h',
-      'timing_function.cc',
-      'timing_function.h',
+      'animation/timing_function.cc',
+      'animation/timing_function.h',
       'input/top_controls_manager.cc',
       'input/top_controls_manager.h',
       'input/top_controls_manager_client.h',
       'resources/transferable_resource.cc',
       'resources/transferable_resource.h',
-      'transform_operation.cc',
-      'transform_operation.h',
-      'transform_operations.cc',
-      'transform_operations.h',
+      'animation/transform_operation.cc',
+      'animation/transform_operation.h',
+      'animation/transform_operations.cc',
+      'animation/transform_operations.h',
       'trees/tree_synchronizer.cc',
       'trees/tree_synchronizer.h',
       'base/util.h',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index b8c4317..01b009b 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -28,7 +28,7 @@
       'trees/layer_sorter_unittest.cc',
       'trees/layer_tree_host_common_unittest.cc',
       'trees/layer_tree_host_impl_unittest.cc',
-      'layer_tree_host_pixeltest_filters.cc',
+      'trees/layer_tree_host_pixeltest_filters.cc',
       'trees/layer_tree_host_unittest.cc',
       'trees/layer_tree_host_unittest_animation.cc',
       'trees/layer_tree_host_unittest_context.cc',
@@ -66,9 +66,9 @@
       'layers/tiled_layer_unittest.cc',
       'base/tiling_data_unittest.cc',
       'input/top_controls_manager_unittest.cc',
-      'transform_operations_unittest.cc',
+      'animation/transform_operations_unittest.cc',
       'trees/tree_synchronizer_unittest.cc',
-      'timing_function_unittest.cc',
+      'animation/timing_function_unittest.cc',
       'test/fake_web_graphics_context_3d_unittest.cc',
       'scheduler/vsync_time_source_unittest.cc',
     ],
diff --git a/cc/latency_info.h b/cc/debug/latency_info.h
index 0e8e7de..e59658d 100644
--- a/cc/latency_info.h
+++ b/cc/debug/latency_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_LATENCY_INFO_H_
-#define CC_LATENCY_INFO_H_
+#ifndef CC_DEBUG_LATENCY_INFO_H_
+#define CC_DEBUG_LATENCY_INFO_H_
 
 #include "base/time.h"
 
@@ -27,5 +27,5 @@ struct LatencyInfo {
 
 }  // namespace cc
 
-#endif  // CC_LATENCY_INFO_H_
+#endif  // CC_DEBUG_LATENCY_INFO_H_
 
diff --git a/cc/pinch_zoom_scrollbar.cc b/cc/input/pinch_zoom_scrollbar.cc
index 0f00633..e287810 100644
--- a/cc/pinch_zoom_scrollbar.cc
+++ b/cc/input/pinch_zoom_scrollbar.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/pinch_zoom_scrollbar.h"
+#include "cc/input/pinch_zoom_scrollbar.h"
 
+#include "cc/input/pinch_zoom_scrollbar_geometry.h"
 #include "cc/layers/layer.h"
-#include "cc/pinch_zoom_scrollbar_geometry.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
diff --git a/cc/pinch_zoom_scrollbar.h b/cc/input/pinch_zoom_scrollbar.h
index e1430fe..aad5b27 100644
--- a/cc/pinch_zoom_scrollbar.h
+++ b/cc/input/pinch_zoom_scrollbar.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_PINCH_ZOOM_SCROLLBAR_H_
-#define CC_PINCH_ZOOM_SCROLLBAR_H_
+#ifndef CC_INPUT_PINCH_ZOOM_SCROLLBAR_H_
+#define CC_INPUT_PINCH_ZOOM_SCROLLBAR_H_
 
 #include "cc/base/cc_export.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
@@ -49,4 +49,4 @@ class PinchZoomScrollbar : public WebKit::WebScrollbar {
 };  // class PinchZoomScrollbar
 
 }  // namespace cc
-#endif // CC_PINCH_ZOOM_SCROLLBAR_H_
+#endif // CC_INPUT_PINCH_ZOOM_SCROLLBAR_H_
diff --git a/cc/pinch_zoom_scrollbar_geometry.cc b/cc/input/pinch_zoom_scrollbar_geometry.cc
index b755550..9f1dce9 100644
--- a/cc/pinch_zoom_scrollbar_geometry.cc
+++ b/cc/input/pinch_zoom_scrollbar_geometry.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/pinch_zoom_scrollbar_geometry.h"
+#include "cc/input/pinch_zoom_scrollbar_geometry.h"
 
 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
 
diff --git a/cc/pinch_zoom_scrollbar_geometry.h b/cc/input/pinch_zoom_scrollbar_geometry.h
index e4b40dd..be43fdb3 100644
--- a/cc/pinch_zoom_scrollbar_geometry.h
+++ b/cc/input/pinch_zoom_scrollbar_geometry.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_PINCH_ZOOM_SCROLLBAR_GEOMETRY_H_
-#define CC_PINCH_ZOOM_SCROLLBAR_GEOMETRY_H_
+#ifndef CC_INPUT_PINCH_ZOOM_SCROLLBAR_GEOMETRY_H_
+#define CC_INPUT_PINCH_ZOOM_SCROLLBAR_GEOMETRY_H_
 
 #include "cc/base/cc_export.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemeGeometry.h"
@@ -47,4 +47,4 @@ class PinchZoomScrollbarGeometry : public WebScrollbarThemeGeometry {
 };
 
 } // namespace WebKit
-#endif  // CC_PINCH_ZOOM_SCROLLBAR_GEOMETRY_H_
+#endif  // CC_INPUT_PINCH_ZOOM_SCROLLBAR_GEOMETRY_H_
diff --git a/cc/pinch_zoom_scrollbar_painter.cc b/cc/input/pinch_zoom_scrollbar_painter.cc
index fdab038..8fc5278 100644
--- a/cc/pinch_zoom_scrollbar_painter.cc
+++ b/cc/input/pinch_zoom_scrollbar_painter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/pinch_zoom_scrollbar_painter.h"
+#include "cc/input/pinch_zoom_scrollbar_painter.h"
 
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/rect.h"
diff --git a/cc/pinch_zoom_scrollbar_painter.h b/cc/input/pinch_zoom_scrollbar_painter.h
index 49aeb1b..1a45678 100644
--- a/cc/pinch_zoom_scrollbar_painter.h
+++ b/cc/input/pinch_zoom_scrollbar_painter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_PINCH_ZOOM_SCROLLBAR_PAINTER_H_
-#define CC_PINCH_ZOOM_SCROLLBAR_PAINTER_H_
+#ifndef CC_INPUT_PINCH_ZOOM_SCROLLBAR_PAINTER_H_
+#define CC_INPUT_PINCH_ZOOM_SCROLLBAR_PAINTER_H_
 
 #include "base/compiler_specific.h"
 #include "cc/layers/scrollbar_theme_painter.h"
@@ -38,4 +38,4 @@ class PinchZoomScrollbarPainter : public ScrollbarThemePainter {
 
 }  // namespace cc
 
-#endif  // CC_PINCH_ZOOM_SCROLLBAR_PAINTER_H_
+#endif  // CC_INPUT_PINCH_ZOOM_SCROLLBAR_PAINTER_H_
diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc
index 2028e8d..a0ea636 100644
--- a/cc/input/top_controls_manager.cc
+++ b/cc/input/top_controls_manager.cc
@@ -9,8 +9,8 @@
 #include "base/logging.h"
 #include "base/time.h"
 #include "cc/animation/keyframed_animation_curve.h"
+#include "cc/animation/timing_function.h"
 #include "cc/input/top_controls_manager_client.h"
-#include "cc/timing_function.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/vector2d_f.h"
diff --git a/cc/managed_tile_state.cc b/cc/resources/managed_tile_state.cc
index 82bd0ed..fe8b192 100644
--- a/cc/managed_tile_state.cc
+++ b/cc/resources/managed_tile_state.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/managed_tile_state.h"
+#include "cc/resources/managed_tile_state.h"
 
 #include "cc/base/math_util.h"
 
diff --git a/cc/managed_tile_state.h b/cc/resources/managed_tile_state.h
index c701f00..3452da7 100644
--- a/cc/managed_tile_state.h
+++ b/cc/resources/managed_tile_state.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_MANAGED_TILE_STATE_H_
-#define CC_MANAGED_TILE_STATE_H_
+#ifndef CC_RESOURCES_MANAGED_TILE_STATE_H_
+#define CC_RESOURCES_MANAGED_TILE_STATE_H_
 
 #include <list>
 
@@ -114,4 +114,4 @@ class CC_EXPORT ManagedTileState {
 
 }  // namespace cc
 
-#endif
+#endif  // CC_RESOURCES_MANAGED_TILE_STATE_H_
diff --git a/cc/resources/tile.h b/cc/resources/tile.h
index edf5645..904eb0b 100644
--- a/cc/resources/tile.h
+++ b/cc/resources/tile.h
@@ -8,7 +8,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "cc/managed_tile_state.h"
+#include "cc/resources/managed_tile_state.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/trees/layer_tree_host_impl.h"
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index 8711b35..99435e8 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -6,9 +6,9 @@
 
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
+#include "cc/animation/transform_operations.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
-#include "cc/transform_operations.h"
 
 using cc::Animation;
 using cc::AnimationCurve;
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index f3592a8..4f30730 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -7,6 +7,7 @@
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_registrar.h"
 #include "cc/animation/layer_animation_controller.h"
+#include "cc/animation/timing_function.h"
 #include "cc/base/thread_impl.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/content_layer.h"
@@ -17,7 +18,6 @@
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/occlusion_tracker_test_common.h"
 #include "cc/test/tiled_layer_test_common.h"
-#include "cc/timing_function.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 81ab616..c9e68e0 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -16,15 +16,15 @@
 #include "cc/base/switches.h"
 #include "cc/base/thread.h"
 #include "cc/debug/overdraw_metrics.h"
+#include "cc/input/pinch_zoom_scrollbar.h"
+#include "cc/input/pinch_zoom_scrollbar_geometry.h"
+#include "cc/input/pinch_zoom_scrollbar_painter.h"
 #include "cc/input/top_controls_manager.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/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_common.h"
diff --git a/cc/layer_tree_host_pixeltest_filters.cc b/cc/trees/layer_tree_host_pixeltest_filters.cc
index 37d2931..37d2931 100644
--- a/cc/layer_tree_host_pixeltest_filters.cc
+++ b/cc/trees/layer_tree_host_pixeltest_filters.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 8cb0b22..c035581 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -5,6 +5,7 @@
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/synchronization/lock.h"
+#include "cc/animation/timing_function.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/layer_impl.h"
@@ -24,7 +25,6 @@
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test_common.h"
 #include "cc/test/occlusion_tracker_test_common.h"
-#include "cc/timing_function.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
index 1fffca8..20695e6 100644
--- a/cc/trees/layer_tree_host_unittest_animation.cc
+++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -6,12 +6,12 @@
 
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
+#include "cc/animation/timing_function.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"
-#include "cc/timing_function.h"
 
 namespace cc {
 namespace {
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 9b5f41d..a426d5a 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/input/pinch_zoom_scrollbar.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/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "ui/gfx/size_conversions.h"
diff --git a/webkit/compositor_bindings/web_animation_curve_common.cc b/webkit/compositor_bindings/web_animation_curve_common.cc
index a3964d1..82bfd14e 100644
--- a/webkit/compositor_bindings/web_animation_curve_common.cc
+++ b/webkit/compositor_bindings/web_animation_curve_common.cc
@@ -4,7 +4,7 @@
 
 #include "webkit/compositor_bindings/web_animation_curve_common.h"
 
-#include "cc/timing_function.h"
+#include "cc/animation/timing_function.h"
 
 namespace WebKit {
 
diff --git a/webkit/compositor_bindings/web_compositor_support_impl.cc b/webkit/compositor_bindings/web_compositor_support_impl.cc
index 092d33f..dcda417 100644
--- a/webkit/compositor_bindings/web_compositor_support_impl.cc
+++ b/webkit/compositor_bindings/web_compositor_support_impl.cc
@@ -6,10 +6,10 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
+#include "cc/animation/transform_operations.h"
 #include "cc/base/thread_impl.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/software_output_device.h"
-#include "cc/transform_operations.h"
 #include "webkit/compositor_bindings/web_animation_impl.h"
 #include "webkit/compositor_bindings/web_content_layer_impl.h"
 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h"
diff --git a/webkit/compositor_bindings/web_float_animation_curve_impl.cc b/webkit/compositor_bindings/web_float_animation_curve_impl.cc
index 679f984..cb3357f 100644
--- a/webkit/compositor_bindings/web_float_animation_curve_impl.cc
+++ b/webkit/compositor_bindings/web_float_animation_curve_impl.cc
@@ -6,7 +6,7 @@
 
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/keyframed_animation_curve.h"
-#include "cc/timing_function.h"
+#include "cc/animation/timing_function.h"
 #include "webkit/compositor_bindings/web_animation_curve_common.h"
 
 namespace WebKit {
diff --git a/webkit/compositor_bindings/web_float_animation_curve_unittest.cc b/webkit/compositor_bindings/web_float_animation_curve_unittest.cc
index a05b5a1..ec272ab 100644
--- a/webkit/compositor_bindings/web_float_animation_curve_unittest.cc
+++ b/webkit/compositor_bindings/web_float_animation_curve_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/timing_function.h"
+#include "cc/animation/timing_function.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h"
 
diff --git a/webkit/compositor_bindings/web_transform_animation_curve_impl.cc b/webkit/compositor_bindings/web_transform_animation_curve_impl.cc
index fba23e5..db30520 100644
--- a/webkit/compositor_bindings/web_transform_animation_curve_impl.cc
+++ b/webkit/compositor_bindings/web_transform_animation_curve_impl.cc
@@ -5,8 +5,8 @@
 #include "webkit/compositor_bindings/web_transform_animation_curve_impl.h"
 
 #include "cc/animation/keyframed_animation_curve.h"
-#include "cc/timing_function.h"
-#include "cc/transform_operations.h"
+#include "cc/animation/timing_function.h"
+#include "cc/animation/transform_operations.h"
 #include "webkit/compositor_bindings/web_animation_curve_common.h"
 #include "webkit/compositor_bindings/web_transform_operations_impl.h"
 
diff --git a/webkit/compositor_bindings/web_transform_operations_impl.h b/webkit/compositor_bindings/web_transform_operations_impl.h
index f40baee..49a464e 100644
--- a/webkit/compositor_bindings/web_transform_operations_impl.h
+++ b/webkit/compositor_bindings/web_transform_operations_impl.h
@@ -6,7 +6,7 @@
 #define WEBKIT_COMPOSITOR_BINDINGS_WEB_TRANSFORM_OPERATIONS_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/transform_operations.h"
+#include "cc/animation/transform_operations.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformOperations.h"
 #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h"