cc: Get rid of temporary (stub) header files under test/ directory.

This switches them to use the Chromium style for header include paths.

BUG=155413
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org

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

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

70 files changed, 121 insertions, 242 deletions

diff --git a/cc/active_animation_unittest.cc b/cc/active_animation_unittest.cc
index c3076c9..a70e5b0 100644
--- a/cc/active_animation_unittest.cc
+++ b/cc/active_animation_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "CCActiveAnimation.h"
 
-#include "CCAnimationTestCommon.h"
+#include "cc/test/animation_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 80b71a1..0835b88 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -58,48 +58,30 @@
     ],
     'cc_tests_support_files': [
       'test/animation_test_common.cc',
-      'test/CCAnimationTestCommon.h',
-      'test/geometry_test_utils.cc',
-      'test/CCGeometryTestUtils.h',
-      'test/layer_test_common.cc',
-      'test/CCLayerTestCommon.h',
-      'test/CCOcclusionTrackerTestCommon.h',
-      'test/scheduler_test_common.cc',
-      'test/CCSchedulerTestCommon.h',
-      'test/CCRenderPassTestCommon.h',
-      'test/CCTestCommon.h',
-      'test/tiled_layer_test_common.cc',
-      'test/CCTiledLayerTestCommon.h',
-      'test/CompositorFakeWebGraphicsContext3D.h',
-      'test/FakeCCGraphicsContext.h',
-      'test/fake_layer_tree_host_client.cc',
-      'test/FakeCCLayerTreeHostClient.h',
-      'test/fake_graphics_context_3d_unittest.cc',
-      'test/FakeWebCompositorSoftwareOutputDevice.h',
-      'test/FakeWebCompositorOutputSurface.h',
-      'test/FakeWebGraphicsContext3D.h',
-      'test/FakeWebScrollbarThemeGeometry.h',
-      'test/mock_quad_culler.cc',
-      'test/MockCCQuadCuller.h',
-      'test/WebCompositorInitializer.h',
-
       'test/animation_test_common.h',
-      'test/geometry_test_utils.h',
-      'test/layer_test_common.h',
-      'test/layer_tree_test_common.h',
-      'test/occlusion_tracker_test_common.h',
-      'test/render_pass_test_common.h',
-      'test/scheduler_test_common.h',
-      'test/test_common.h',
-      'test/tiled_layer_test_common.h',
       'test/compositor_fake_web_graphics_context_3d.h',
       'test/fake_graphics_context.h',
+      'test/fake_graphics_context_3d_unittest.cc',
+      'test/fake_layer_tree_host_client.cc',
       'test/fake_layer_tree_host_client.h',
       'test/fake_web_compositor_output_surface.h',
       'test/fake_web_compositor_software_output_device.h',
       'test/fake_web_graphics_context_3d.h',
       'test/fake_web_scrollbar_theme_geometry.h',
+      'test/geometry_test_utils.cc',
+      'test/geometry_test_utils.h',
+      'test/layer_test_common.cc',
+      'test/layer_test_common.h',
+      'test/layer_tree_test_common.h',
+      'test/mock_quad_culler.cc',
       'test/mock_quad_culler.h',
+      'test/occlusion_tracker_test_common.h',
+      'test/render_pass_test_common.h',
+      'test/scheduler_test_common.cc',
+      'test/scheduler_test_common.h',
+      'test/test_common.h',
+      'test/tiled_layer_test_common.cc',
+      'test/tiled_layer_test_common.h',
       'test/web_compositor_initializer.h',
     ],
   },
diff --git a/cc/content_layer_unittest.cc b/cc/content_layer_unittest.cc
index dc84df7..883fc88 100644
--- a/cc/content_layer_unittest.cc
+++ b/cc/content_layer_unittest.cc
@@ -7,9 +7,9 @@
 #include "ContentLayerChromium.h"
 
 #include "BitmapCanvasLayerTextureUpdater.h"
-#include "CCGeometryTestUtils.h"
 #include "CCRenderingStats.h"
 #include "ContentLayerChromiumClient.h"
+#include "cc/test/geometry_test_utils.h"
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebFloatRect.h>
diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc
index 75fe8e4..1302539 100644
--- a/cc/damage_tracker_unittest.cc
+++ b/cc/damage_tracker_unittest.cc
@@ -6,12 +6,12 @@
 
 #include "CCDamageTracker.h"
 
-#include "CCGeometryTestUtils.h"
 #include "CCLayerImpl.h"
 #include "CCLayerSorter.h"
 #include "CCLayerTreeHostCommon.h"
 #include "CCMathUtil.h"
 #include "CCSingleThreadProxy.h"
+#include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
diff --git a/cc/delay_based_time_source_unittest.cc b/cc/delay_based_time_source_unittest.cc
index 1819123..d03df23 100644
--- a/cc/delay_based_time_source_unittest.cc
+++ b/cc/delay_based_time_source_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "CCDelayBasedTimeSource.h"
 
-#include "CCSchedulerTestCommon.h"
 #include "CCThread.h"
+#include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <wtf/RefPtr.h>
 
diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc
index 1744c6d..e530377 100644
--- a/cc/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/delegated_renderer_layer_impl_unittest.cc
@@ -7,18 +7,18 @@
 #include "CCDelegatedRendererLayerImpl.h"
 
 #include "CCAppendQuadsData.h"
-#include "CCGeometryTestUtils.h"
 #include "CCLayerTreeHostImpl.h"
 #include "CCQuadSink.h"
 #include "CCRenderPassDrawQuad.h"
-#include "CCRenderPassTestCommon.h"
 #include "CCSingleThreadProxy.h"
 #include "CCSolidColorDrawQuad.h"
 #include "CCSolidColorLayerImpl.h"
-#include "FakeWebCompositorOutputSurface.h"
-#include "FakeWebGraphicsContext3D.h"
-#include "MockCCQuadCuller.h"
 #include "cc/scoped_ptr_vector.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
+#include "cc/test/geometry_test_utils.h"
+#include "cc/test/mock_quad_culler.h"
+#include "cc/test/render_pass_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc
index 0e1ef89..aefe039 100644
--- a/cc/draw_quad_unittest.cc
+++ b/cc/draw_quad_unittest.cc
@@ -8,7 +8,6 @@
 
 #include "CCCheckerboardDrawQuad.h"
 #include "CCDebugBorderDrawQuad.h"
-#include "CCGeometryTestUtils.h"
 #include "CCIOSurfaceDrawQuad.h"
 #include "CCRenderPassDrawQuad.h"
 #include "CCSolidColorDrawQuad.h"
@@ -16,6 +15,7 @@
 #include "CCTextureDrawQuad.h"
 #include "CCTileDrawQuad.h"
 #include "CCYUVVideoDrawQuad.h"
+#include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/frame_rate_controller_unittest.cc b/cc/frame_rate_controller_unittest.cc
index 5895c21..888b343 100644
--- a/cc/frame_rate_controller_unittest.cc
+++ b/cc/frame_rate_controller_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "CCFrameRateController.h"
 
-#include "CCSchedulerTestCommon.h"
+#include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace cc;
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index 5a11cb3..1b64595 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -10,11 +10,11 @@
 #include "CCResourceProvider.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
-#include "CCTestCommon.h"
-#include "FakeWebCompositorOutputSurface.h"
-#include "FakeWebGraphicsContext3D.h"
 #include "GraphicsContext3D.h"
-#include "WebCompositorInitializer.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
+#include "cc/test/test_common.h"
+#include "cc/test/web_compositor_initializer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/layer_animation_controller_unittest.cc b/cc/layer_animation_controller_unittest.cc
index 4d9e575..cd1450b 100644
--- a/cc/layer_animation_controller_unittest.cc
+++ b/cc/layer_animation_controller_unittest.cc
@@ -8,7 +8,7 @@
 
 #include "CCActiveAnimation.h"
 #include "CCAnimationCurve.h"
-#include "CCAnimationTestCommon.h"
+#include "cc/test/animation_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc
index af74b1f..a2c9792 100644
--- a/cc/layer_tree_host_common_unittest.cc
+++ b/cc/layer_tree_host_common_unittest.cc
@@ -6,8 +6,6 @@
 
 #include "CCLayerTreeHostCommon.h"
 
-#include "CCAnimationTestCommon.h"
-#include "CCGeometryTestUtils.h"
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerSorter.h"
@@ -18,7 +16,8 @@
 #include "ContentLayerChromium.h"
 #include "ContentLayerChromiumClient.h"
 #include "LayerChromium.h"
-
+#include "cc/test/animation_test_common.h"
+#include "cc/test/geometry_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 0427663..9220e64 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -6,33 +6,33 @@
 
 #include "CCLayerTreeHostImpl.h"
 
-#include "CCAnimationTestCommon.h"
 #include "CCDelegatedRendererLayerImpl.h"
-#include "CCGeometryTestUtils.h"
 #include "CCHeadsUpDisplayLayerImpl.h"
 #include "CCIOSurfaceLayerImpl.h"
 #include "CCLayerImpl.h"
-#include "CCLayerTestCommon.h"
 #include "CCLayerTilingData.h"
 #include "CCQuadSink.h"
 #include "CCRenderPassDrawQuad.h"
-#include "CCRenderPassTestCommon.h"
 #include "CCRendererGL.h"
 #include "CCScrollbarGeometryFixedThumb.h"
 #include "CCScrollbarLayerImpl.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
 #include "CCSolidColorDrawQuad.h"
-#include "CCTestCommon.h"
 #include "CCTextureDrawQuad.h"
 #include "CCTextureLayerImpl.h"
 #include "CCTileDrawQuad.h"
 #include "CCTiledLayerImpl.h"
 #include "CCVideoLayerImpl.h"
-#include "FakeWebCompositorOutputSurface.h"
-#include "FakeWebGraphicsContext3D.h"
-#include "FakeWebScrollbarThemeGeometry.h"
 #include "base/hash_tables.h"
+#include "cc/test/animation_test_common.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
+#include "cc/test/fake_web_scrollbar_theme_geometry.h"
+#include "cc/test/geometry_test_utils.h"
+#include "cc/test/layer_test_common.h"
+#include "cc/test/render_pass_test_common.h"
+#include "cc/test/test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebVideoFrame.h>
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index 1f5914e..a79295a 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -6,11 +6,8 @@
 
 #include "CCLayerTreeHost.h"
 
-#include "base/synchronization/lock.h"
-#include "CCGeometryTestUtils.h"
 #include "CCGraphicsContext.h"
 #include "CCLayerTreeHostImpl.h"
-#include "CCOcclusionTrackerTestCommon.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
 #include "CCTextureUpdateQueue.h"
@@ -19,7 +16,10 @@
 #include "ContentLayerChromium.h"
 #include "ContentLayerChromiumClient.h"
 #include "Extensions3DChromium.h"
-#include "FakeWebCompositorOutputSurface.h"
+#include "base/synchronization/lock.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
+#include "cc/test/geometry_test_utils.h"
+#include "cc/test/occlusion_tracker_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include <public/Platform.h>
 #include <public/WebLayerScrollClient.h>
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
index eb6a297..aa5d58c 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layer_unittest.cc
@@ -6,14 +6,14 @@
 
 #include "LayerChromium.h"
 
-#include "CCGeometryTestUtils.h"
 #include "CCKeyframedAnimationCurve.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
 #include "CCSingleThreadProxy.h"
-#include "FakeCCLayerTreeHostClient.h"
 #include "LayerPainterChromium.h"
-#include "WebCompositorInitializer.h"
+#include "cc/test/fake_layer_tree_host_client.h"
+#include "cc/test/geometry_test_utils.h"
+#include "cc/test/web_compositor_initializer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/math_util_unittest.cc b/cc/math_util_unittest.cc
index 5fd1e8ec..b246923 100644
--- a/cc/math_util_unittest.cc
+++ b/cc/math_util_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "CCMathUtil.h"
 
-#include "CCGeometryTestUtils.h"
 #include "FloatRect.h"
+#include "cc/test/geometry_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc
index d3385a3..7bd1b77 100644
--- a/cc/occlusion_tracker_unittest.cc
+++ b/cc/occlusion_tracker_unittest.cc
@@ -6,17 +6,17 @@
 
 #include "CCOcclusionTracker.h"
 
-#include "CCAnimationTestCommon.h"
-#include "CCGeometryTestUtils.h"
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHostCommon.h"
 #include "CCMathUtil.h"
-#include "CCOcclusionTrackerTestCommon.h"
 #include "CCOverdrawMetrics.h"
 #include "CCSingleThreadProxy.h"
 #include "LayerChromium.h"
 #include "Region.h"
+#include "cc/test/animation_test_common.h"
+#include "cc/test/geometry_test_utils.h"
+#include "cc/test/occlusion_tracker_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebFilterOperation.h>
diff --git a/cc/prioritized_texture_unittest.cc b/cc/prioritized_texture_unittest.cc
index b055b35..25b677f 100644
--- a/cc/prioritized_texture_unittest.cc
+++ b/cc/prioritized_texture_unittest.cc
@@ -9,9 +9,9 @@
 #include "CCPrioritizedTextureManager.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include "CCTexture.h"
-#include "CCTiledLayerTestCommon.h"
-#include "FakeCCGraphicsContext.h"
-#include "WebCompositorInitializer.h"
+#include "cc/test/fake_graphics_context.h"
+#include "cc/test/tiled_layer_test_common.h"
+#include "cc/test/web_compositor_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace cc;
diff --git a/cc/render_pass_unittest.cc b/cc/render_pass_unittest.cc
index 6c7423f..6a3a0ec 100644
--- a/cc/render_pass_unittest.cc
+++ b/cc/render_pass_unittest.cc
@@ -7,7 +7,7 @@
 #include "CCRenderPass.h"
 
 #include "CCCheckerboardDrawQuad.h"
-#include "CCGeometryTestUtils.h"
+#include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/render_surface_filters_unittest.cc b/cc/render_surface_filters_unittest.cc
index 66d3e80..0c4283d 100644
--- a/cc/render_surface_filters_unittest.cc
+++ b/cc/render_surface_filters_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "CCRenderSurfaceFilters.h"
 
-#include "CompositorFakeWebGraphicsContext3D.h"
+#include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc
index d9728c5..ce3bd09 100644
--- a/cc/render_surface_unittest.cc
+++ b/cc/render_surface_unittest.cc
@@ -11,8 +11,8 @@
 #include "CCRenderPassSink.h"
 #include "CCSharedQuadState.h"
 #include "CCSingleThreadProxy.h"
-#include "MockCCQuadCuller.h"
 #include "cc/scoped_ptr_vector.h"
+#include "cc/test/mock_quad_culler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc
index b6c8fad..c5b6b64 100644
--- a/cc/resource_provider_unittest.cc
+++ b/cc/resource_provider_unittest.cc
@@ -8,9 +8,9 @@
 
 #include "CCGraphicsContext.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
-#include "CompositorFakeWebGraphicsContext3D.h"
 #include "Extensions3DChromium.h"
-#include "FakeWebCompositorOutputSurface.h"
+#include "cc/test/compositor_fake_web_graphics_context_3d.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/HashMap.h>
diff --git a/cc/scheduler_unittest.cc b/cc/scheduler_unittest.cc
index dc218b9..24a3615 100644
--- a/cc/scheduler_unittest.cc
+++ b/cc/scheduler_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "CCScheduler.h"
 
-#include "CCSchedulerTestCommon.h"
+#include "cc/test/scheduler_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <wtf/OwnPtr.h>
diff --git a/cc/scoped_texture_unittest.cc b/cc/scoped_texture_unittest.cc
index b707a7f..6dd293b 100644
--- a/cc/scoped_texture_unittest.cc
+++ b/cc/scoped_texture_unittest.cc
@@ -8,9 +8,9 @@
 
 #include "CCRenderer.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
-#include "CCTiledLayerTestCommon.h"
-#include "FakeCCGraphicsContext.h"
 #include "GraphicsContext3D.h"
+#include "cc/test/fake_graphics_context.h"
+#include "cc/test/tiled_layer_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace cc;
diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc
index 3aa6aa0..577daed 100644
--- a/cc/scrollbar_layer_unittest.cc
+++ b/cc/scrollbar_layer_unittest.cc
@@ -9,8 +9,8 @@
 #include "CCScrollbarAnimationController.h"
 #include "CCScrollbarLayerImpl.h"
 #include "CCSingleThreadProxy.h"
-#include "FakeWebScrollbarThemeGeometry.h"
 #include "TreeSynchronizer.h"
+#include "cc/test/fake_web_scrollbar_theme_geometry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebScrollbar.h>
 #include <public/WebScrollbarThemeGeometry.h>
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc
index fdce395..65f5b0d 100644
--- a/cc/software_renderer_unittest.cc
+++ b/cc/software_renderer_unittest.cc
@@ -6,19 +6,19 @@
 
 #include "CCRendererSoftware.h"
 
-#include "CCAnimationTestCommon.h"
-#include "CCGeometryTestUtils.h"
 #include "CCQuadSink.h"
 #include "CCRenderPass.h"
 #include "CCRenderPassDrawQuad.h"
-#include "CCRenderPassTestCommon.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include "CCSolidColorDrawQuad.h"
-#include "CCTestCommon.h"
 #include "CCTileDrawQuad.h"
-#include "FakeWebCompositorSoftwareOutputDevice.h"
-#include "FakeWebCompositorOutputSurface.h"
+#include "cc/test/animation_test_common.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
+#include "cc/test/fake_web_compositor_software_output_device.h"
+#include "cc/test/geometry_test_utils.h"
+#include "cc/test/render_pass_test_common.h"
+#include "cc/test/test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc
index f1e091f..0149c38 100644
--- a/cc/solid_color_layer_impl_unittest.cc
+++ b/cc/solid_color_layer_impl_unittest.cc
@@ -7,10 +7,10 @@
 #include "CCSolidColorLayerImpl.h"
 
 #include "CCAppendQuadsData.h"
-#include "CCLayerTestCommon.h"
 #include "CCSingleThreadProxy.h"
 #include "CCSolidColorDrawQuad.h"
-#include "MockCCQuadCuller.h"
+#include "cc/test/layer_test_common.h"
+#include "cc/test/mock_quad_culler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/test/CCAnimationTestCommon.h b/cc/test/CCAnimationTestCommon.h
deleted file mode 100644
index 975865b..0000000
--- a/cc/test/CCAnimationTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/animation_test_common.h"
diff --git a/cc/test/CCGeometryTestUtils.h b/cc/test/CCGeometryTestUtils.h
deleted file mode 100644
index 713965b..0000000
--- a/cc/test/CCGeometryTestUtils.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/geometry_test_utils.h"
diff --git a/cc/test/CCLayerTestCommon.h b/cc/test/CCLayerTestCommon.h
deleted file mode 100644
index 5c7eab2..0000000
--- a/cc/test/CCLayerTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/layer_test_common.h"
diff --git a/cc/test/CCOcclusionTrackerTestCommon.h b/cc/test/CCOcclusionTrackerTestCommon.h
deleted file mode 100644
index 547d2af..0000000
--- a/cc/test/CCOcclusionTrackerTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/occlusion_tracker_test_common.h"
diff --git a/cc/test/CCRenderPassTestCommon.h b/cc/test/CCRenderPassTestCommon.h
deleted file mode 100644
index 18ed36e..0000000
--- a/cc/test/CCRenderPassTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/render_pass_test_common.h"
diff --git a/cc/test/CCSchedulerTestCommon.h b/cc/test/CCSchedulerTestCommon.h
deleted file mode 100644
index abfb555..0000000
--- a/cc/test/CCSchedulerTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/scheduler_test_common.h"
diff --git a/cc/test/CCTestCommon.h b/cc/test/CCTestCommon.h
deleted file mode 100644
index 3556e10..0000000
--- a/cc/test/CCTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/test_common.h"
diff --git a/cc/test/CCTiledLayerTestCommon.h b/cc/test/CCTiledLayerTestCommon.h
deleted file mode 100644
index b6d4584..0000000
--- a/cc/test/CCTiledLayerTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/tiled_layer_test_common.h"
diff --git a/cc/test/CompositorFakeWebGraphicsContext3D.h b/cc/test/CompositorFakeWebGraphicsContext3D.h
deleted file mode 100644
index 0776746..0000000
--- a/cc/test/CompositorFakeWebGraphicsContext3D.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/compositor_fake_web_graphics_context_3d.h"
diff --git a/cc/test/FakeCCGraphicsContext.h b/cc/test/FakeCCGraphicsContext.h
deleted file mode 100644
index dbf1627..0000000
--- a/cc/test/FakeCCGraphicsContext.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/fake_graphics_context.h"
diff --git a/cc/test/FakeCCLayerTreeHostClient.h b/cc/test/FakeCCLayerTreeHostClient.h
deleted file mode 100644
index 0c4bf37..0000000
--- a/cc/test/FakeCCLayerTreeHostClient.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/fake_layer_tree_host_client.h"
diff --git a/cc/test/FakeWebCompositorOutputSurface.h b/cc/test/FakeWebCompositorOutputSurface.h
deleted file mode 100644
index e42fc08..0000000
--- a/cc/test/FakeWebCompositorOutputSurface.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/fake_web_compositor_output_surface.h"
diff --git a/cc/test/FakeWebCompositorSoftwareOutputDevice.h b/cc/test/FakeWebCompositorSoftwareOutputDevice.h
deleted file mode 100644
index 4d87f1c..0000000
--- a/cc/test/FakeWebCompositorSoftwareOutputDevice.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/fake_web_compositor_software_output_device.h"
diff --git a/cc/test/FakeWebGraphicsContext3D.h b/cc/test/FakeWebGraphicsContext3D.h
deleted file mode 100644
index bdb1732..0000000
--- a/cc/test/FakeWebGraphicsContext3D.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/fake_web_graphics_context_3d.h"
diff --git a/cc/test/FakeWebScrollbarThemeGeometry.h b/cc/test/FakeWebScrollbarThemeGeometry.h
deleted file mode 100644
index eed0de8..0000000
--- a/cc/test/FakeWebScrollbarThemeGeometry.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/fake_web_scrollbar_theme_geometry.h"
diff --git a/cc/test/MockCCQuadCuller.h b/cc/test/MockCCQuadCuller.h
deleted file mode 100644
index 5c632df..0000000
--- a/cc/test/MockCCQuadCuller.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/mock_quad_culler.h"
diff --git a/cc/test/WebCompositorInitializer.h b/cc/test/WebCompositorInitializer.h
deleted file mode 100644
index ed922d6..0000000
--- a/cc/test/WebCompositorInitializer.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 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.
-
-// Temporary forwarding header
-#include "cc/test/web_compositor_initializer.h"
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index 9c76834..e7264ee 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCAnimationTestCommon.h"
+#include "cc/test/animation_test_common.h"
 
 #include "CCKeyframedAnimationCurve.h"
 #include "CCLayerAnimationController.h"
diff --git a/cc/test/compositor_fake_web_graphics_context_3d.h b/cc/test/compositor_fake_web_graphics_context_3d.h
index 2a709a2..f76b042 100644
--- a/cc/test/compositor_fake_web_graphics_context_3d.h
+++ b/cc/test/compositor_fake_web_graphics_context_3d.h
@@ -5,7 +5,7 @@
 #ifndef CompositorFakeWebGraphicsContext3D_h
 #define CompositorFakeWebGraphicsContext3D_h
 
-#include "FakeWebGraphicsContext3D.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebKit {
diff --git a/cc/test/fake_graphics_context.h b/cc/test/fake_graphics_context.h
index a592bf0..755ac3d 100644
--- a/cc/test/fake_graphics_context.h
+++ b/cc/test/fake_graphics_context.h
@@ -6,8 +6,8 @@
 #define FakeCCGraphicsContext_h
 
 #include "CCGraphicsContext.h"
-#include "CompositorFakeWebGraphicsContext3D.h"
-#include "FakeWebCompositorOutputSurface.h"
+#include "cc/test/compositor_fake_web_graphics_context_3d.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
 #include <public/WebCompositorOutputSurface.h>
 
 namespace WebKit {
diff --git a/cc/test/fake_graphics_context_3d_unittest.cc b/cc/test/fake_graphics_context_3d_unittest.cc
index bb06e64..57912295 100644
--- a/cc/test/fake_graphics_context_3d_unittest.cc
+++ b/cc/test/fake_graphics_context_3d_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "FakeWebGraphicsContext3D.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/test/fake_layer_tree_host_client.cc b/cc/test/fake_layer_tree_host_client.cc
index b658810..36b5cc4 100644
--- a/cc/test/fake_layer_tree_host_client.cc
+++ b/cc/test/fake_layer_tree_host_client.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "FakeCCLayerTreeHostClient.h"
+#include "cc/test/fake_layer_tree_host_client.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h
index ef71715..e4e335f 100644
--- a/cc/test/fake_layer_tree_host_client.h
+++ b/cc/test/fake_layer_tree_host_client.h
@@ -6,11 +6,11 @@
 
 #include "config.h"
 
-#include "base/memory/scoped_ptr.h"
 #include "CCInputHandler.h"
 #include "CCLayerTreeHost.h"
-#include "CompositorFakeWebGraphicsContext3D.h"
-#include "FakeWebCompositorOutputSurface.h"
+#include "base/memory/scoped_ptr.h"
+#include "cc/test/compositor_fake_web_graphics_context_3d.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_web_compositor_output_surface.h b/cc/test/fake_web_compositor_output_surface.h
index 179576f..2d3128c 100644
--- a/cc/test/fake_web_compositor_output_surface.h
+++ b/cc/test/fake_web_compositor_output_surface.h
@@ -6,7 +6,7 @@
 #define FakeWebCompositorOutputSurface_h
 
 #include "base/memory/scoped_ptr.h"
-#include "FakeWebCompositorSoftwareOutputDevice.h"
+#include "cc/test/fake_web_compositor_software_output_device.h"
 #include <public/WebCompositorOutputSurface.h>
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/OwnPtr.h>
diff --git a/cc/test/geometry_test_utils.cc b/cc/test/geometry_test_utils.cc
index a079475..a76517c 100644
--- a/cc/test/geometry_test_utils.cc
+++ b/cc/test/geometry_test_utils.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCGeometryTestUtils.h"
+#include "cc/test/geometry_test_utils.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index f62c488..fda251c 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -4,7 +4,8 @@
 
 #include "config.h"
 
-#include "CCLayerTestCommon.h"
+#include "cc/test/layer_test_common.h"
+
 #include "CCDrawQuad.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/test/mock_quad_culler.cc b/cc/test/mock_quad_culler.cc
index 96cd206..282dddc 100644
--- a/cc/test/mock_quad_culler.cc
+++ b/cc/test/mock_quad_culler.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "MockCCQuadCuller.h"
+#include "cc/test/mock_quad_culler.h"
 
 namespace cc {
 
diff --git a/cc/test/scheduler_test_common.cc b/cc/test/scheduler_test_common.cc
index 728cdc5..3e58f36 100644
--- a/cc/test/scheduler_test_common.cc
+++ b/cc/test/scheduler_test_common.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCSchedulerTestCommon.h"
+#include "cc/test/scheduler_test_common.h"
 
 namespace WebKitTests {
 
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc
index 12d50c7..6747dfd 100644
--- a/cc/test/tiled_layer_test_common.cc
+++ b/cc/test/tiled_layer_test_common.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCTiledLayerTestCommon.h"
+#include "cc/test/tiled_layer_test_common.h"
 
 using namespace cc;
 
diff --git a/cc/texture_copier_unittest.cc b/cc/texture_copier_unittest.cc
index 1c1fb1d..d3dae9d 100644
--- a/cc/texture_copier_unittest.cc
+++ b/cc/texture_copier_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "TextureCopier.h"
 
-#include "FakeWebGraphicsContext3D.h"
 #include "GraphicsContext3D.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <wtf/RefPtr.h>
diff --git a/cc/texture_layer_unittest.cc b/cc/texture_layer_unittest.cc
index b9d7474..7f71a16 100644
--- a/cc/texture_layer_unittest.cc
+++ b/cc/texture_layer_unittest.cc
@@ -7,8 +7,8 @@
 #include "TextureLayerChromium.h"
 
 #include "CCLayerTreeHost.h"
-#include "FakeCCLayerTreeHostClient.h"
-#include "WebCompositorInitializer.h"
+#include "cc/test/fake_layer_tree_host_client.h"
+#include "cc/test/web_compositor_initializer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/texture_update_controller_unittest.cc b/cc/texture_update_controller_unittest.cc
index cb6e2df..55f6b6f 100644
--- a/cc/texture_update_controller_unittest.cc
+++ b/cc/texture_update_controller_unittest.cc
@@ -6,12 +6,12 @@
 
 #include "CCTextureUpdateController.h"
 
-#include "CCSchedulerTestCommon.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
-#include "CCTiledLayerTestCommon.h"
-#include "FakeWebCompositorOutputSurface.h"
-#include "FakeWebGraphicsContext3D.h"
-#include "WebCompositorInitializer.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
+#include "cc/test/scheduler_test_common.h"
+#include "cc/test/tiled_layer_test_common.h"
+#include "cc/test/web_compositor_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebThread.h>
 #include <wtf/RefPtr.h>
diff --git a/cc/threaded_unittest.cc b/cc/threaded_unittest.cc
index 690c7368..66a5a2d 100644
--- a/cc/threaded_unittest.cc
+++ b/cc/threaded_unittest.cc
@@ -7,23 +7,23 @@
 #include "CCThreadedTest.h"
 
 #include "CCActiveAnimation.h"
-#include "CCAnimationTestCommon.h"
 #include "CCInputHandler.h"
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHostImpl.h"
-#include "CCOcclusionTrackerTestCommon.h"
 #include "CCScopedThreadProxy.h"
 #include "CCSingleThreadProxy.h"
 #include "CCTextureUpdateQueue.h"
 #include "CCThreadTask.h"
-#include "CCTiledLayerTestCommon.h"
 #include "CCTimingFunction.h"
 #include "ContentLayerChromium.h"
-#include "FakeWebCompositorOutputSurface.h"
-#include "FakeWebGraphicsContext3D.h"
 #include "LayerChromium.h"
 #include "base/stl_util.h"
+#include "cc/test/animation_test_common.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
+#include "cc/test/occlusion_tracker_test_common.h"
+#include "cc/test/tiled_layer_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include <public/Platform.h>
 #include <public/WebCompositorSupport.h>
diff --git a/cc/threaded_unittest.h b/cc/threaded_unittest.h
index fea740a..d1638a3 100644
--- a/cc/threaded_unittest.h
+++ b/cc/threaded_unittest.h
@@ -8,8 +8,8 @@
 #include "CCLayerTreeHost.h"
 #include "CCLayerTreeHostImpl.h"
 #include "CCScopedThreadProxy.h"
-#include "CompositorFakeWebGraphicsContext3D.h"
 #include "base/hash_tables.h"
+#include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebAnimationDelegate.h>
 #include <public/WebThread.h>
diff --git a/cc/throttled_texture_uploader_unittest.cc b/cc/throttled_texture_uploader_unittest.cc
index ca60324..0519494 100644
--- a/cc/throttled_texture_uploader_unittest.cc
+++ b/cc/throttled_texture_uploader_unittest.cc
@@ -8,9 +8,8 @@
 
 #include "CCPrioritizedTexture.h"
 #include "Extensions3DChromium.h"
-#include "FakeWebGraphicsContext3D.h"
 #include "GraphicsContext3D.h"
-
+#include "cc/test/fake_web_graphics_context_3d.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <wtf/RefPtr.h>
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc
index ff5ef9e..d3e6fcb 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/tiled_layer_impl_unittest.cc
@@ -7,11 +7,11 @@
 #include "CCTiledLayerImpl.h"
 
 #include "CCAppendQuadsData.h"
-#include "CCLayerTestCommon.h"
 #include "CCLayerTilingData.h"
 #include "CCSingleThreadProxy.h"
 #include "CCTileDrawQuad.h"
-#include "MockCCQuadCuller.h"
+#include "cc/test/layer_test_common.h"
+#include "cc/test/mock_quad_culler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index 172dafb..14c52a6 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -7,17 +7,17 @@
 #include "TiledLayerChromium.h"
 
 #include "BitmapCanvasLayerTextureUpdater.h"
-#include "CCAnimationTestCommon.h"
-#include "CCGeometryTestUtils.h"
 #include "CCOverdrawMetrics.h"
 #include "CCRenderingStats.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include "CCTextureUpdateController.h"
-#include "CCTiledLayerTestCommon.h"
-#include "FakeCCGraphicsContext.h"
-#include "FakeCCLayerTreeHostClient.h"
 #include "LayerPainterChromium.h"
-#include "WebCompositorInitializer.h"
+#include "cc/test/animation_test_common.h"
+#include "cc/test/fake_graphics_context.h"
+#include "cc/test/fake_layer_tree_host_client.h"
+#include "cc/test/geometry_test_utils.h"
+#include "cc/test/tiled_layer_test_common.h"
+#include "cc/test/web_compositor_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/timer_unittest.cc b/cc/timer_unittest.cc
index f29b3e3..3cc497f 100644
--- a/cc/timer_unittest.cc
+++ b/cc/timer_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "CCTimer.h"
 
-#include "CCSchedulerTestCommon.h"
+#include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace cc;
diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc
index 86b44aa..4d16ad3 100644
--- a/cc/tree_synchronizer_unittest.cc
+++ b/cc/tree_synchronizer_unittest.cc
@@ -6,13 +6,13 @@
 
 #include "TreeSynchronizer.h"
 
-#include "CCAnimationTestCommon.h"
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCProxy.h"
 #include "CCSingleThreadProxy.h"
 #include "LayerChromium.h"
 #include "Region.h"
+#include "cc/test/animation_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace cc;
diff --git a/webkit/compositor_bindings/WebLayerTest.cpp b/webkit/compositor_bindings/WebLayerTest.cpp
index 52bcf909..36571d3 100644
--- a/webkit/compositor_bindings/WebLayerTest.cpp
+++ b/webkit/compositor_bindings/WebLayerTest.cpp
@@ -5,8 +5,8 @@
 #include "config.h"
 #include <public/WebLayer.h>
 
-#include "CompositorFakeWebGraphicsContext3D.h"
-#include "WebCompositorInitializer.h"
+#include "cc/test/compositor_fake_web_graphics_context_3d.h"
+#include "cc/test/web_compositor_initializer.h"
 #include "WebLayerImpl.h"
 #include "WebLayerTreeViewTestCommon.h"
 #include <public/WebContentLayer.h>
diff --git a/webkit/compositor_bindings/WebLayerTreeViewTest.cpp b/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
index cf35185..14b373b1 100644
--- a/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
@@ -6,8 +6,8 @@
 
 #include <public/WebLayerTreeView.h>
 
-#include "CompositorFakeWebGraphicsContext3D.h"
-#include "FakeWebCompositorOutputSurface.h"
+#include "cc/test/compositor_fake_web_graphics_context_3d.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
 #include "WebLayerTreeViewTestCommon.h"
 #include <gmock/gmock.h>
 #include <public/Platform.h>
diff --git a/webkit/compositor_bindings/WebTransformOperationsTest.cpp b/webkit/compositor_bindings/WebTransformOperationsTest.cpp
index efc0003..2263e14 100644
--- a/webkit/compositor_bindings/WebTransformOperationsTest.cpp
+++ b/webkit/compositor_bindings/WebTransformOperationsTest.cpp
@@ -6,7 +6,7 @@
 
 #include <public/WebTransformOperations.h>
 
-#include "CCGeometryTestUtils.h"
+#include "cc/test/geometry_test_utils.h"
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 #include <wtf/OwnPtr.h>
diff --git a/webkit/compositor_bindings/WebTransformationMatrixTest.cpp b/webkit/compositor_bindings/WebTransformationMatrixTest.cpp
index f0b09fc..850302c 100644
--- a/webkit/compositor_bindings/WebTransformationMatrixTest.cpp
+++ b/webkit/compositor_bindings/WebTransformationMatrixTest.cpp
@@ -6,7 +6,7 @@
 
 #include <public/WebTransformationMatrix.h>
 
-#include "CCGeometryTestUtils.h"
+#include "cc/test/geometry_test_utils.h"
 #include <gtest/gtest.h>
 #include <wtf/MathExtras.h>
 
diff --git a/webkit/compositor_bindings/test/WebLayerTreeViewTestCommon.h b/webkit/compositor_bindings/test/WebLayerTreeViewTestCommon.h
index b3a5318..305febf 100644
--- a/webkit/compositor_bindings/test/WebLayerTreeViewTestCommon.h
+++ b/webkit/compositor_bindings/test/WebLayerTreeViewTestCommon.h
@@ -5,8 +5,8 @@
 #ifndef WebLayerTreeViewTestCommon_h
 #define WebLayerTreeViewTestCommon_h
 
-#include "CompositorFakeWebGraphicsContext3D.h"
-#include "FakeWebCompositorOutputSurface.h"
+#include "cc/test/compositor_fake_web_graphics_context_3d.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
 #include <gmock/gmock.h>
 #include <public/WebLayerTreeViewClient.h>