Revert 162284 - cc: Get rid of CC*.h temporary header files.

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

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

TBR=tfarina@chromium.org

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

cc/CCActiveAnimation.h

@@ -0,0 +1,6 @@
+// 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/active_animation.h"

cc/CCAnimationCurve.h

@@ -0,0 +1,6 @@
+// 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/animation_curve.h"

cc/CCAnimationEvents.h

@@ -0,0 +1,6 @@
+// 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/animation_events.h"

cc/CCCompletionEvent.h

@@ -0,0 +1,6 @@
+// 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/completion_event.h"

cc/CCMathUtil.h

@@ -0,0 +1,6 @@
+// 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/math_util.h"

cc/CCRendererGL.h

@@ -0,0 +1,6 @@
+// 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/gl_renderer.h"

cc/CCRendererSoftware.h

@@ -0,0 +1,6 @@
+// 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/software_renderer.h"

cc/CCRenderingStats.h

@@ -0,0 +1,6 @@
+// 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/rendering_stats.h"

cc/CCResourceProvider.h

@@ -0,0 +1,6 @@
+// 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/resource_provider.h"

cc/CCScheduler.h

@@ -0,0 +1,6 @@
+// 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/scheduler.h"

cc/CCSchedulerStateMachine.h

@@ -0,0 +1,6 @@
+// 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/scheduler_state_machine.h"

cc/CCScopedTexture.h

@@ -0,0 +1,6 @@
+// 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/scoped_texture.h"

cc/CCScopedThreadProxy.h

@@ -0,0 +1,6 @@
+// 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/scoped_thread_proxy.h"

cc/CCTextureLayerImpl.h

@@ -0,0 +1,6 @@
+// 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/texture_layer_impl.h"

cc/CCTextureUpdateController.h

@@ -0,0 +1,6 @@
+// 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/texture_update_controller.h"

cc/CCTextureUpdateQueue.h

@@ -0,0 +1,6 @@
+// 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/texture_update_queue.h"

cc/CCThread.h

@@ -0,0 +1,6 @@
+// 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/thread.h"

cc/CCThreadProxy.h

@@ -0,0 +1,6 @@
+// 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/thread_proxy.h"

cc/CCThreadTask.h

@@ -0,0 +1,6 @@
+// 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/thread_task.h"

cc/CCThreadedTest.h

@@ -0,0 +1,6 @@
+// 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/threaded_unittest.h"

cc/CCTileDrawQuad.h

@@ -0,0 +1,6 @@
+// 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/tile_draw_quad.h"

cc/CCTiledLayerImpl.h

@@ -0,0 +1,6 @@
+// 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/tiled_layer_impl.h"

cc/CCTimeSource.h

@@ -0,0 +1,6 @@
+// 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/time_source.h"

cc/CCTimer.h

@@ -0,0 +1,6 @@
+// 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/timer.h"

cc/CCTimingFunction.h

@@ -0,0 +1,6 @@
+// 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/timing_function.h"

cc/CCVideoLayerImpl.h

@@ -0,0 +1,6 @@
+// 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/video_layer_impl.h"

cc/CCYUVVideoDrawQuad.h

@@ -0,0 +1,6 @@
+// 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/yuv_video_draw_quad.h"

cc/active_animation.cc

@@ -4,9 +4,9 @@
 
 #include "config.h"
 
-#include "cc/active_animation.h"
+#include "CCActiveAnimation.h"
 
-#include "cc/animation_curve.h"
+#include "CCAnimationCurve.h"
 #include "TraceEvent.h"
 #ifdef LOG
 #undef LOG

cc/active_animation_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "cc/active_animation.h"
+#include "CCActiveAnimation.h"
 
 #include "cc/test/animation_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"

cc/animation_curve.cc

@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "cc/animation_curve.h"
+#include "CCAnimationCurve.h"
 
 namespace cc {
 

cc/animation_events.h

@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "cc/active_animation.h"
+#include "CCActiveAnimation.h"
 
 namespace cc {
 

cc/bitmap_canvas_layer_texture_updater.cc

@@ -6,9 +6,9 @@
 
 #include "cc/bitmap_canvas_layer_texture_updater.h"
 
+#include "CCTextureUpdateQueue.h"
 #include "cc/layer_painter.h"
 #include "cc/platform_color.h"
-#include "cc/texture_update_queue.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace cc {

cc/bitmap_skpicture_canvas_layer_texture_updater.cc

@@ -6,8 +6,8 @@
 
 #include "cc/bitmap_skpicture_canvas_layer_texture_updater.h"
 
-#include "cc/rendering_stats.h"
-#include "cc/texture_update_queue.h"
+#include "CCRenderingStats.h"
+#include "CCTextureUpdateQueue.h"
 #include "cc/layer_painter.h"
 #include "cc/platform_color.h"
 #include "third_party/skia/include/core/SkCanvas.h"

cc/canvas_layer_texture_updater.cc

@@ -6,7 +6,7 @@
 
 #include "cc/canvas_layer_texture_updater.h"
 
-#include "cc/rendering_stats.h"
+#include "CCRenderingStats.h"
 #include "FloatRect.h"
 #include "SkiaUtils.h"
 #include "TraceEvent.h"

cc/cc.gyp

@@ -5,286 +5,307 @@
 {
   'variables': {
     'cc_source_files': [
-      'CCAppendQuadsData.h',
-      'CCCheckerboardDrawQuad.h',
-      'CCDamageTracker.h',
-      'CCDebugBorderDrawQuad.h',
-      'CCDebugRectHistory.h',
-      'CCDelayBasedTimeSource.h',
-      'CCDelegatedRendererLayerImpl.h',
-      'CCDirectRenderer.h',
-      'CCDrawQuad.h',
-      'CCFontAtlas.h',
-      'CCFrameRateController.h',
-      'CCFrameRateCounter.h',
-      'CCGraphicsContext.h',
-      'CCHeadsUpDisplayLayerImpl.h',
-      'CCIOSurfaceDrawQuad.h',
-      'CCIOSurfaceLayerImpl.h',
-      'CCInputHandler.h',
-      'CCKeyframedAnimationCurve.h',
-      'CCLayerAnimationController.h',
-      'CCLayerImpl.h',
-      'CCLayerIterator.h',
-      'CCLayerQuad.h',
-      'CCLayerSorter.h',
-      'CCLayerTilingData.h',
-      'CCLayerTreeHost.h',
-      'CCLayerTreeHostClient.h',
-      'CCLayerTreeHostCommon.h',
-      'CCLayerTreeHostImpl.h',
-      'CCOcclusionTracker.h',
-      'CCOverdrawMetrics.h',
-      'CCPageScaleAnimation.h',
-      'CCPrioritizedTexture.h',
-      'CCPrioritizedTextureManager.h',
-      'CCPriorityCalculator.h',
-      'CCQuadCuller.h',
-      'CCQuadSink.h',
-      'CCRenderPass.h',
-      'CCRenderPassDrawQuad.h',
-      'CCRenderPassSink.h',
-      'CCRenderSurface.h',
-      'CCRenderSurfaceFilters.h',
-      'CCRenderer.h',
-      'CCScrollbarAnimationControllerLinearFade.h',
-      'CCScrollbarGeometryFixedThumb.h',
-      'CCScrollbarGeometryStub.h',
-      'CCScrollbarLayerImpl.h',
-      'CCSettings.h',
-      'CCSharedQuadState.h',
-      'CCSingleThreadProxy.h',
-      'CCSolidColorDrawQuad.h',
-      'CCSolidColorLayerImpl.h',
-      'CCStreamVideoDrawQuad.h',
-      'CCTexture.h',
-      'CCTextureDrawQuad.h',
-      'active_animation.cc',
-      'active_animation.h',
-      'animation_curve.cc',
-      'animation_curve.h',
-      'animation_events.h',
-      'append_quads_data.h',
+      'hash_pair.h',
+      'scoped_ptr_hash_map.h',
+      'scoped_ptr_vector.h',
       'bitmap_canvas_layer_texture_updater.cc',
       'bitmap_canvas_layer_texture_updater.h',
       'bitmap_skpicture_canvas_layer_texture_updater.cc',
       'bitmap_skpicture_canvas_layer_texture_updater.h',
       'caching_bitmap_canvas_layer_texture_updater.cc',
       'caching_bitmap_canvas_layer_texture_updater.h',
+      'active_animation.cc',
+      'CCActiveAnimation.h',
+      'CCAppendQuadsData.h',
+      'animation_curve.cc',
+      'CCAnimationCurve.h',
+      'CCAnimationEvents.h',
+      'checkerboard_draw_quad.cc',
+      'CCCheckerboardDrawQuad.h',
+      'CCCompletionEvent.h',
+      'damage_tracker.cc',
+      'CCDamageTracker.h',
+      'debug_border_draw_quad.cc',
+      'CCDebugBorderDrawQuad.h',
+      'debug_rect_history.cc',
+      'CCDebugRectHistory.h',
+      'delay_based_time_source.cc',
+      'CCDelayBasedTimeSource.h',
+      'delegated_renderer_layer_impl.cc',
+      'CCDelegatedRendererLayerImpl.h',
+      'direct_renderer.cc',
+      'CCDirectRenderer.h',
+      'draw_quad.cc',
+      'CCDrawQuad.h',
+      'font_atlas.cc',
+      'CCFontAtlas.h',
+      'frame_rate_controller.cc',
+      'CCFrameRateController.h',
+      'frame_rate_counter.cc',
+      'CCFrameRateCounter.h',
+      'CCGraphicsContext.h',
+      'heads_up_display_layer_impl.cc',
+      'CCHeadsUpDisplayLayerImpl.h',
+      'io_surface_draw_quad.cc',
+      'CCIOSurfaceDrawQuad.h',
+      'io_surface_layer_impl.cc',
+      'CCIOSurfaceLayerImpl.h',
+      'CCInputHandler.h',
+      'keyframed_animation_curve.cc',
+      'CCKeyframedAnimationCurve.h',
+      'layer_animation_controller.cc',
+      'CCLayerAnimationController.h',
+      'layer_impl.cc',
+      'CCLayerImpl.h',
+      'layer_iterator.cc',
+      'CCLayerIterator.h',
+      'layer_quad.cc',
+      'CCLayerQuad.h',
+      'layer_sorter.cc',
+      'CCLayerSorter.h',
+      'layer_tiling_data.cc',
+      'CCLayerTilingData.h',
+      'layer_tree_host.cc',
+      'CCLayerTreeHost.h',
+      'CCLayerTreeHostClient.h',
+      'layer_tree_host_common.cc',
+      'CCLayerTreeHostCommon.h',
+      'layer_tree_host_impl.cc',
+      'CCLayerTreeHostImpl.h',
+      'math_util.cc',
+      'CCMathUtil.h',
+      'occlusion_tracker.cc',
+      'CCOcclusionTracker.h',
+      'overdraw_metrics.cc',
+      'CCOverdrawMetrics.h',
+      'page_scale_animation.cc',
+      'CCPageScaleAnimation.h',
+      'prioritized_texture.cc',
+      'CCPrioritizedTexture.h',
+      'prioritized_texture_manager.cc',
+      'CCPrioritizedTextureManager.h',
+      'priority_calculator.cc',
+      'CCPriorityCalculator.h',
+      'proxy.cc',
+      'CCProxy.h',
+      'quad_culler.cc',
+      'CCQuadCuller.h',
+      'CCQuadSink.h',
+      'render_pass.cc',
+      'CCRenderPass.h',
+      'render_pass_draw_quad.cc',
+      'CCRenderPassDrawQuad.h',
+      'CCRenderPassSink.h',
+      'render_surface_impl.cc',
+      'CCRenderSurface.h',
+      'render_surface_filters.cc',
+      'CCRenderSurfaceFilters.h',
+      'renderer.cc',
+      'CCRenderer.h',
+      'gl_renderer.cc',
+      'CCRendererGL.h',
+      'software_renderer.cc',
+      'CCRendererSoftware.h',
+      'CCRenderingStats.h',
+      'resource_provider.cc',
+      'CCResourceProvider.h',
+      'scheduler.cc',
+      'CCScheduler.h',
+      'scheduler_state_machine.cc',
+      'CCSchedulerStateMachine.h',
+      'scoped_texture.cc',
+      'CCScopedTexture.h',
+      'scoped_thread_proxy.cc',
+      'CCScopedThreadProxy.h',
+      'scrollbar_animation_controller.cc',
+      'CCScrollbarAnimationController.h',
+      'scrollbar_animation_controller_linear_fade.cc',
+      'CCScrollbarAnimationControllerLinearFade.h',
+      'scrollbar_layer_impl.cc',
+      'CCScrollbarLayerImpl.h',
+      'scrollbar_geometry_fixed_thumb.cc',
+      'CCScrollbarGeometryFixedThumb.h',
+      'scrollbar_geometry_stub.cc',
+      'CCScrollbarGeometryStub.h',
+      'settings.cc',
+      'CCSettings.h',
+      'shared_quad_state.cc',
+      'CCSharedQuadState.h',
+      'single_thread_proxy.cc',
+      'CCSingleThreadProxy.h',
+      'solid_color_draw_quad.cc',
+      'CCSolidColorDrawQuad.h',
+      'solid_color_layer_impl.cc',
+      'CCSolidColorLayerImpl.h',
+      'stream_video_draw_quad.cc',
+      'CCStreamVideoDrawQuad.h',
+      'texture.cc',
+      'CCTexture.h',
+      'texture_draw_quad.cc',
+      'CCTextureDrawQuad.h',
+      'texture_layer_impl.cc',
+      'CCTextureLayerImpl.h',
+      'texture_update_controller.cc',
+      'CCTextureUpdateController.h',
+      'texture_update_queue.cc',
+      'CCTextureUpdateQueue.h',
+      'CCThread.h',
+      'thread_proxy.cc',
+      'CCThreadProxy.h',
+      'CCThreadTask.h',
+      'tile_draw_quad.cc',
+      'CCTileDrawQuad.h',
+      'tiled_layer_impl.cc',
+      'CCTiledLayerImpl.h',
+      'CCTimeSource.h',
+      'timer.cc',
+      'CCTimer.h',
+      'timing_function.cc',
+      'CCTimingFunction.h',
+      'video_layer_impl.cc',
+      'CCVideoLayerImpl.h',
+      'yuv_video_draw_quad.cc',
+      'CCYUVVideoDrawQuad.h',
       'canvas_layer_texture_updater.cc',
       'canvas_layer_texture_updater.h',
-      'checkerboard_draw_quad.cc',
-      'checkerboard_draw_quad.h',
-      'completion_event.h',
       'content_layer.cc',
       'content_layer.h',
       'content_layer_client.h',
-      'damage_tracker.cc',
-      'damage_tracker.h',
-      'debug_border_draw_quad.cc',
-      'debug_border_draw_quad.h',
-      'debug_rect_history.cc',
-      'debug_rect_history.h',
-      'delay_based_time_source.cc',
-      'delay_based_time_source.h',
       'delegated_renderer_layer.cc',
       'delegated_renderer_layer.h',
-      'delegated_renderer_layer_impl.cc',
-      'delegated_renderer_layer_impl.h',
-      'direct_renderer.cc',
-      'direct_renderer.h',
-      'draw_quad.cc',
-      'draw_quad.h',
-      'font_atlas.cc',
-      'font_atlas.h',
       'frame_buffer_skpicture_canvas_layer_texture_updater.cc',
       'frame_buffer_skpicture_canvas_layer_texture_updater.h',
-      'frame_rate_controller.cc',
-      'frame_rate_controller.h',
-      'frame_rate_counter.cc',
-      'frame_rate_counter.h',
       'geometry_binding.cc',
       'geometry_binding.h',
-      'gl_renderer.cc',
-      'gl_renderer.h',
-      'graphics_context.h',
-      'hash_pair.h',
-      'hash_pair.h',
       'heads_up_display_layer.cc',
       'heads_up_display_layer.h',
-      'heads_up_display_layer_impl.cc',
-      'heads_up_display_layer_impl.h',
-      'image_layer.cc',
-      'image_layer.h',
-      'input_handler.h',
-      'io_surface_draw_quad.cc',
-      'io_surface_draw_quad.h',
       'io_surface_layer.cc',
       'io_surface_layer.h',
-      'io_surface_layer_impl.cc',
-      'io_surface_layer_impl.h',
-      'keyframed_animation_curve.cc',
-      'keyframed_animation_curve.h',
+      'image_layer.cc',
+      'image_layer.h',
       'layer.cc',
       'layer.h',
-      'layer_animation_controller.cc',
-      'layer_animation_controller.h',
-      'layer_impl.cc',
-      'layer_impl.h',
-      'layer_iterator.cc',
-      'layer_iterator.h',
       'layer_painter.h',
-      'layer_quad.cc',
-      'layer_quad.h',
-      'layer_sorter.cc',
-      'layer_sorter.h',
       'layer_texture_sub_image.cc',
       'layer_texture_sub_image.h',
-      'layer_texture_sub_image.h',
       'layer_texture_updater.cc',
       'layer_texture_updater.h',
-      'layer_tiling_data.cc',
-      'layer_tiling_data.h',
-      'layer_tree_host.cc',
-      'layer_tree_host.h',
-      'layer_tree_host_client.h',
-      'layer_tree_host_common.cc',
-      'layer_tree_host_common.h',
-      'layer_tree_host_impl.cc',
-      'layer_tree_host_impl.h',
-      'math_util.cc',
-      'math_util.h',
-      'occlusion_tracker.cc',
-      'occlusion_tracker.h',
-      'overdraw_metrics.cc',
-      'overdraw_metrics.h',
-      'page_scale_animation.cc',
-      'page_scale_animation.h',
       'platform_color.h',
-      'platform_color.h',
-      'prioritized_texture.cc',
-      'prioritized_texture.h',
-      'prioritized_texture_manager.cc',
-      'prioritized_texture_manager.h',
-      'priority_calculator.cc',
-      'priority_calculator.h',
       'program_binding.cc',
       'program_binding.h',
-      'proxy.cc',
-      'proxy.h',
-      'quad_culler.cc',
-      'quad_culler.h',
-      'quad_sink.h',
       'rate_limiter.cc',
       'rate_limiter.h',
-      'render_pass.cc',
-      'render_pass.h',
-      'render_pass_draw_quad.cc',
-      'render_pass_draw_quad.h',
-      'render_pass_sink.h',
       'render_surface.cc',
       'render_surface.h',
-      'render_surface_filters.cc',
-      'render_surface_filters.h',
-      'render_surface_impl.cc',
-      'render_surface_impl.h',
-      'renderer.cc',
-      'renderer.h',
-      'rendering_stats.h',
-      'resource_provider.cc',
-      'resource_provider.h',
-      'scheduler.cc',
-      'scheduler.h',
-      'scheduler_state_machine.cc',
-      'scheduler_state_machine.h',
-      'scoped_ptr_hash_map.h',
-      'scoped_ptr_hash_map.h',
-      'scoped_ptr_vector.h',
-      'scoped_ptr_vector.h',
-      'scoped_texture.cc',
-      'scoped_texture.h',
-      'scoped_thread_proxy.cc',
-      'scoped_thread_proxy.h',
-      'scrollbar_animation_controller.cc',
-      'scrollbar_animation_controller.h',
-      'scrollbar_animation_controller_linear_fade.cc',
-      'scrollbar_animation_controller_linear_fade.h',
-      'scrollbar_geometry_fixed_thumb.cc',
-      'scrollbar_geometry_fixed_thumb.h',
-      'scrollbar_geometry_stub.cc',
-      'scrollbar_geometry_stub.h',
       'scrollbar_layer.cc',
       'scrollbar_layer.h',
-      'scrollbar_layer_impl.cc',
-      'scrollbar_layer_impl.h',
-      'settings.cc',
-      'settings.h',
       'shader.cc',
       'shader.h',
-      'shared_quad_state.cc',
-      'shared_quad_state.h',
-      'single_thread_proxy.cc',
-      'single_thread_proxy.h',
       'skpicture_canvas_layer_texture_updater.cc',
       'skpicture_canvas_layer_texture_updater.h',
-      'software_renderer.cc',
-      'software_renderer.h',
-      'solid_color_draw_quad.cc',
-      'solid_color_draw_quad.h',
       'solid_color_layer.cc',
       'solid_color_layer.h',
-      'solid_color_layer_impl.cc',
-      'solid_color_layer_impl.h',
-      'stream_video_draw_quad.cc',
-      'stream_video_draw_quad.h',
-      'switches.cc',
       'switches.cc',
       'switches.h',
-      'switches.h',
-      'texture.cc',
-      'texture.h',
       'texture_copier.cc',
       'texture_copier.h',
-      'texture_copier.h',
-      'texture_draw_quad.cc',
-      'texture_draw_quad.h',
       'texture_layer.cc',
       'texture_layer.h',
       'texture_layer_client.h',
-      'texture_layer_impl.cc',
-      'texture_layer_impl.h',
-      'texture_update_controller.cc',
-      'texture_update_controller.h',
-      'texture_update_queue.cc',
-      'texture_update_queue.h',
       'texture_uploader.h',
-      'thread.h',
-      'thread_proxy.cc',
-      'thread_proxy.h',
-      'thread_task.h',
-      'threaded_test.h',
       'throttled_texture_uploader.cc',
       'throttled_texture_uploader.h',
-      'tile_draw_quad.cc',
-      'tile_draw_quad.h',
-      'tiled_layer.cc',
-      'tiled_layer.h',
-      'tiled_layer_impl.cc',
-      'tiled_layer_impl.h',
-      'time_source.h',
-      'timer.cc',
-      'timer.h',
-      'timing_function.cc',
-      'timing_function.h',
-      'tree_synchronizer.cc',
-      'tree_synchronizer.h',
       'unthrottled_texture_uploader.cc',
       'unthrottled_texture_uploader.h',
+      'tiled_layer.cc',
+      'tiled_layer.h',
+      'tree_synchronizer.cc',
+      'tree_synchronizer.h',
       'video_layer.cc',
       'video_layer.h',
-      'video_layer_impl.cc',
+
+      'active_animation.h',
+      'animation_curve.h',
+      'animation_events.h',
+      'append_quads_data.h',
+      'checkerboard_draw_quad.h',
+      'completion_event.h',
+      'damage_tracker.h',
+      'debug_border_draw_quad.h',
+      'debug_rect_history.h',
+      'delay_based_time_source.h',
+      'delegated_renderer_layer_impl.h',
+      'direct_renderer.h',
+      'draw_quad.h',
+      'font_atlas.h',
+      'frame_rate_controller.h',
+      'frame_rate_counter.h',
+      'graphics_context.h',
+      'heads_up_display_layer_impl.h',
+      'input_handler.h',
+      'io_surface_draw_quad.h',
+      'io_surface_layer_impl.h',
+      'keyframed_animation_curve.h',
+      'layer_animation_controller.h',
+      'layer_impl.h',
+      'layer_iterator.h',
+      'layer_quad.h',
+      'layer_sorter.h',
+      'layer_tiling_data.h',
+      'layer_tree_host_client.h',
+      'layer_tree_host_common.h',
+      'layer_tree_host.h',
+      'layer_tree_host_impl.h',
+      'math_util.h',
+      'occlusion_tracker.h',
+      'overdraw_metrics.h',
+      'page_scale_animation.h',
+      'prioritized_texture.h',
+      'prioritized_texture_manager.h',
+      'priority_calculator.h',
+      'proxy.h',
+      'quad_culler.h',
+      'quad_sink.h',
+      'gl_renderer.h',
+      'renderer.h',
+      'software_renderer.h',
+      'rendering_stats.h',
+      'render_pass_draw_quad.h',
+      'render_pass.h',
+      'render_pass_sink.h',
+      'render_surface_filters.h',
+      'render_surface_impl.h',
+      'resource_provider.h',
+      'scheduler.h',
+      'scheduler_state_machine.h',
+      'scoped_texture.h',
+      'scoped_thread_proxy.h',
+      'scrollbar_animation_controller.h',
+      'scrollbar_animation_controller_linear_fade.h',
+      'scrollbar_geometry_fixed_thumb.h',
+      'scrollbar_geometry_stub.h',
+      'scrollbar_layer_impl.h',
+      'settings.h',
+      'shared_quad_state.h',
+      'single_thread_proxy.h',
+      'solid_color_draw_quad.h',
+      'solid_color_layer_impl.h',
+      'stream_video_draw_quad.h',
+      'texture_draw_quad.h',
+      'texture.h',
+      'texture_layer_impl.h',
+      'texture_update_controller.h',
+      'texture_update_queue.h',
+      'threaded_test.h',
+      'thread.h',
+      'thread_proxy.h',
+      'thread_task.h',
+      'tiled_layer_impl.h',
+      'tile_draw_quad.h',
+      'timer.h',
+      'time_source.h',
+      'timing_function.h',
       'video_layer_impl.h',
-      'yuv_video_draw_quad.cc',
       'yuv_video_draw_quad.h',
     ],
   },

cc/cc_tests.gyp

@@ -6,16 +6,13 @@
   'variables': {
     'chromium_code': 0,
     'cc_tests_source_files': [
+      'hash_pair_unittest.cc',
       'active_animation_unittest.cc',
-      'content_layer_unittest.cc',
       'damage_tracker_unittest.cc',
       'delay_based_time_source_unittest.cc',
-      'delegated_renderer_layer_impl_unittest.cc',
       'draw_quad_unittest.cc',
-      'float_quad_unittest.cc',
+      'delegated_renderer_layer_impl_unittest.cc',
       'frame_rate_controller_unittest.cc',
-      'gl_renderer_unittest.cc',
-      'hash_pair_unittest.cc',
       'heads_up_display_unittest.cc',
       'keyframed_animation_curve_unittest.cc',
       'layer_animation_controller_unittest.cc',
@@ -26,33 +23,36 @@
       'layer_tree_host_common_unittest.cc',
       'layer_tree_host_impl_unittest.cc',
       'layer_tree_host_unittest.cc',
-      'layer_unittest.cc',
       'math_util_unittest.cc',
       'occlusion_tracker_unittest.cc',
       'prioritized_texture_unittest.cc',
       'quad_culler_unittest.cc',
+      'software_renderer_unittest.cc',
       'render_pass_unittest.cc',
       'render_surface_filters_unittest.cc',
       'render_surface_unittest.cc',
+      'gl_renderer_unittest.cc',
       'resource_provider_unittest.cc',
       'scheduler_state_machine_unittest.cc',
       'scheduler_unittest.cc',
       'scoped_texture_unittest.cc',
       'scrollbar_animation_controller_linear_fade_unittest.cc',
-      'scrollbar_layer_unittest.cc',
-      'software_renderer_unittest.cc',
       'solid_color_layer_impl_unittest.cc',
-      'texture_copier_unittest.cc',
-      'texture_layer_unittest.cc',
       'texture_update_controller_unittest.cc',
       'thread_task_unittest.cc',
-      'threaded_test.h',
       'threaded_unittest.cc',
       'threaded_unittest.h',
-      'throttled_texture_uploader_unittest.cc',
+      'CCThreadedTest.h',
       'tiled_layer_impl_unittest.cc',
-      'tiled_layer_unittest.cc',
       'timer_unittest.cc',
+      'content_layer_unittest.cc',
+      'float_quad_unittest.cc',
+      'layer_unittest.cc',
+      'scrollbar_layer_unittest.cc',
+      'texture_copier_unittest.cc',
+      'texture_layer_unittest.cc',
+      'throttled_texture_uploader_unittest.cc',
+      'tiled_layer_unittest.cc',
       'tree_synchronizer_unittest.cc',
     ],
     'cc_tests_support_files': [

cc/content_layer_unittest.cc

@@ -6,9 +6,9 @@
 
 #include "cc/content_layer.h"
 
+#include "CCRenderingStats.h"
 #include "cc/bitmap_canvas_layer_texture_updater.h"
 #include "cc/content_layer_client.h"
-#include "cc/rendering_stats.h"
 #include "cc/test/geometry_test_utils.h"
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"

cc/damage_tracker.cc

@@ -8,7 +8,7 @@
 
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHostCommon.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCRenderSurface.h"
 #include <public/WebFilterOperations.h>
 

cc/damage_tracker_unittest.cc

@@ -9,7 +9,7 @@
 #include "CCLayerImpl.h"
 #include "CCLayerSorter.h"
 #include "CCLayerTreeHostCommon.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCSingleThreadProxy.h"
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"

cc/debug_rect_history.cc

@@ -9,7 +9,7 @@
 #include "CCDamageTracker.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 
 namespace cc {
 

cc/delay_based_time_source.h

@@ -5,8 +5,8 @@
 #ifndef CCDelayBasedTimeSource_h
 #define CCDelayBasedTimeSource_h
 
-#include "cc/time_source.h"
-#include "cc/timer.h"
+#include "CCTimeSource.h"
+#include "CCTimer.h"
 #include <wtf/PassRefPtr.h>
 
 namespace cc {

cc/delay_based_time_source_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "CCDelayBasedTimeSource.h"
 
-#include "cc/thread.h"
+#include "CCThread.h"
 #include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <wtf/RefPtr.h>

cc/delegated_renderer_layer_impl.cc

@@ -8,7 +8,7 @@
 
 #include "CCAppendQuadsData.h"
 #include "CCQuadSink.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCRenderPassDrawQuad.h"
 #include "CCRenderPassSink.h"
 

cc/direct_renderer.cc

@@ -6,7 +6,7 @@
 
 #include "CCDirectRenderer.h"
 
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include <public/WebTransformationMatrix.h>
 #include <vector>
 

cc/direct_renderer.h

@@ -7,8 +7,8 @@
 
 #include "base/basictypes.h"
 #include "CCRenderer.h"
-#include "cc/resource_provider.h"
-#include "cc/scoped_texture.h"
+#include "CCResourceProvider.h"
+#include "CCScopedTexture.h"
 
 namespace cc {
 

cc/draw_quad.cc

@@ -12,8 +12,8 @@
 #include "CCSolidColorDrawQuad.h"
 #include "CCStreamVideoDrawQuad.h"
 #include "CCTextureDrawQuad.h"
-#include "cc/tile_draw_quad.h"
-#include "cc/yuv_video_draw_quad.h"
+#include "CCTileDrawQuad.h"
+#include "CCYUVVideoDrawQuad.h"
 #include "IntRect.h"
 
 namespace cc {

cc/draw_quad_unittest.cc

@@ -13,8 +13,8 @@
 #include "CCSolidColorDrawQuad.h"
 #include "CCStreamVideoDrawQuad.h"
 #include "CCTextureDrawQuad.h"
-#include "cc/tile_draw_quad.h"
-#include "cc/yuv_video_draw_quad.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>

cc/float_quad_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "FloatQuad.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>

cc/font_atlas.cc

@@ -10,7 +10,7 @@
 
 #include "base/string_split.h"
 #include "ui/gfx/point.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace cc {

cc/frame_rate_controller.cc

@@ -7,7 +7,7 @@
 #include "CCFrameRateController.h"
 
 #include "CCDelayBasedTimeSource.h"
-#include "cc/time_source.h"
+#include "CCTimeSource.h"
 #include "TraceEvent.h"
 #include <wtf/CurrentTime.h>
 

cc/frame_rate_controller.h

@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "cc/timer.h"
+#include "CCTimer.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 

cc/frame_rate_counter.cc

@@ -8,7 +8,7 @@
 
 #include <cmath>
 
-#include "cc/proxy.h"
+#include "CCProxy.h"
 #include <public/Platform.h>
 
 namespace cc {

cc/geometry_binding.cc

@@ -6,7 +6,7 @@
 
 #include "cc/geometry_binding.h"
 
-#include "cc/gl_renderer.h" // For the GLC() macro.
+#include "CCRendererGL.h" // For the GLC() macro.
 #include "GraphicsContext3D.h"
 #include <public/WebGraphicsContext3D.h>
 

cc/gl_renderer.cc

@@ -4,18 +4,18 @@
 
 #include "config.h"
 
-#include "cc/gl_renderer.h"
+#include "CCRendererGL.h"
 
 #include "CCDamageTracker.h"
 #include "CCLayerQuad.h"
-#include "cc/math_util.h"
-#include "cc/proxy.h"
+#include "CCMathUtil.h"
+#include "CCProxy.h"
 #include "CCRenderPass.h"
 #include "CCRenderSurfaceFilters.h"
-#include "cc/scoped_texture.h"
+#include "CCScopedTexture.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
-#include "cc/video_layer_impl.h"
+#include "CCVideoLayerImpl.h"
 #include "Extensions3D.h"
 #include "FloatQuad.h"
 #include "GrTexture.h"

cc/gl_renderer.h

@@ -16,8 +16,8 @@
 #include "CCSolidColorDrawQuad.h"
 #include "CCStreamVideoDrawQuad.h"
 #include "CCTextureDrawQuad.h"
-#include "cc/tile_draw_quad.h"
-#include "cc/yuv_video_draw_quad.h"
+#include "CCTileDrawQuad.h"
+#include "CCYUVVideoDrawQuad.h"
 #include "Extensions3DChromium.h"
 
 namespace WebKit {

cc/gl_renderer_unittest.cc

@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 #include "config.h"
-#include "cc/gl_renderer.h"
+#include "CCRendererGL.h"
 
 #include "CCDrawQuad.h"
 #include "CCPrioritizedTextureManager.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
 #include "GraphicsContext3D.h"

cc/heads_up_display_layer_impl.h

@@ -8,7 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "CCFontAtlas.h"
 #include "CCLayerImpl.h"
-#include "cc/scoped_texture.h"
+#include "CCScopedTexture.h"
 
 class SkCanvas;
 

cc/heads_up_display_unittest.cc

@@ -5,9 +5,9 @@
 #include "config.h"
 
 #include "CCLayerTreeHost.h"
+#include "CCThreadedTest.h"
 #include "cc/heads_up_display_layer.h"
 #include "cc/layer.h"
-#include "cc/threaded_unittest.h"
 
 using namespace cc;
 using namespace WebKitTests;

cc/image_layer.cc

@@ -7,10 +7,10 @@
 #include "cc/image_layer.h"
 
 #include "CCLayerTreeHost.h"
+#include "CCTextureUpdateQueue.h"
 #include "base/compiler_specific.h"
 #include "cc/layer_texture_updater.h"
 #include "cc/platform_color.h"
-#include "cc/texture_update_queue.h"
 
 namespace cc {
 

cc/io_surface_layer_impl.cc

@@ -11,7 +11,7 @@
 #include "CCIOSurfaceDrawQuad.h"
 #include "CCLayerTreeHostImpl.h"
 #include "CCQuadSink.h"
-#include "cc/gl_renderer.h" // For the GLC() macro.
+#include "CCRendererGL.h" // For the GLC() macro.
 #include "Extensions3D.h"
 #include <public/WebGraphicsContext3D.h>
 

cc/keyframed_animation_curve.h

@@ -5,8 +5,8 @@
 #ifndef CCKeyframedAnimationCurve_h
 #define CCKeyframedAnimationCurve_h
 
-#include "cc/animation_curve.h"
-#include "cc/timing_function.h"
+#include "CCAnimationCurve.h"
+#include "CCTimingFunction.h"
 #include "scoped_ptr_vector.h"
 #include <public/WebTransformOperations.h>
 

cc/layer.cc

@@ -6,8 +6,8 @@
 
 #include "cc/layer.h"
 
-#include "cc/active_animation.h"
-#include "cc/animation_events.h"
+#include "CCActiveAnimation.h"
+#include "CCAnimationEvents.h"
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"

cc/layer_animation_controller.cc

@@ -6,7 +6,7 @@
 
 #include "CCLayerAnimationController.h"
 
-#include "cc/active_animation.h"
+#include "CCActiveAnimation.h"
 #include "CCKeyframedAnimationCurve.h"
 #include <public/WebTransformationMatrix.h>
 #include <wtf/CurrentTime.h>

cc/layer_animation_controller.h

@@ -5,7 +5,7 @@
 #ifndef CCLayerAnimationController_h
 #define CCLayerAnimationController_h
 
-#include "cc/animation_events.h"
+#include "CCAnimationEvents.h"
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"

cc/layer_animation_controller_unittest.cc

@@ -6,8 +6,8 @@
 
 #include "CCLayerAnimationController.h"
 
-#include "cc/active_animation.h"
-#include "cc/animation_curve.h"
+#include "CCActiveAnimation.h"
+#include "CCAnimationCurve.h"
 #include "cc/test/animation_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

cc/layer_impl.cc

@@ -9,10 +9,10 @@
 #include "base/stringprintf.h"
 #include "CCDebugBorderDrawQuad.h"
 #include "CCLayerSorter.h"
-#include "cc/math_util.h"
-#include "cc/proxy.h"
+#include "CCMathUtil.h"
+#include "CCProxy.h"
 #include "CCQuadSink.h"
-#include "cc/scrollbar_animation_controller.h"
+#include "CCScrollbarAnimationController.h"
 #include "CCSettings.h"
 #include "TraceEvent.h"
 

cc/layer_impl.h

@@ -11,7 +11,7 @@
 #include "CCLayerAnimationController.h"
 #include "CCRenderPass.h"
 #include "CCRenderSurface.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
 #include "CCSharedQuadState.h"
 #include "FloatRect.h"
 #include "IntRect.h"

cc/layer_sorter.cc

@@ -6,7 +6,7 @@
 
 #include "CCLayerSorter.h"
 
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCRenderSurface.h"
 #include <limits.h>
 #include <public/WebTransformationMatrix.h>

cc/layer_sorter_unittest.cc

@@ -7,7 +7,7 @@
 #include "CCLayerSorter.h"
 
 #include "CCLayerImpl.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCSingleThreadProxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>

cc/layer_texture_sub_image.cc

@@ -6,7 +6,7 @@
 
 #include "cc/layer_texture_sub_image.h"
 
-#include "cc/gl_renderer.h" // For the GLC() macro.
+#include "CCRendererGL.h" // For the GLC() macro.
 #include "GraphicsContext3D.h"
 #include "Extensions3DChromium.h"
 #include "TraceEvent.h"

cc/layer_tree_host.cc

@@ -18,11 +18,11 @@
 #include "CCOverdrawMetrics.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
+#include "CCThreadProxy.h"
 #include "Region.h"
 #include "TraceEvent.h"
 #include "cc/heads_up_display_layer.h"
 #include "cc/layer.h"
-#include "cc/thread_proxy.h"
 #include "cc/tree_synchronizer.h"
 
 using namespace std;

cc/layer_tree_host.h

@@ -9,14 +9,14 @@
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "cc/animation_events.h"
+#include "CCAnimationEvents.h"
 #include "CCGraphicsContext.h"
 #include "CCLayerTreeHostClient.h"
 #include "CCLayerTreeHostCommon.h"
 #include "CCOcclusionTracker.h"
 #include "CCPrioritizedTextureManager.h"
-#include "cc/proxy.h"
-#include "cc/rendering_stats.h"
+#include "CCProxy.h"
+#include "CCRenderingStats.h"
 #include "IntRect.h"
 #include "cc/rate_limiter.h"
 #include "scoped_ptr_vector.h"

cc/layer_tree_host_common.cc

@@ -9,7 +9,7 @@
 #include "CCLayerImpl.h"
 #include "CCLayerIterator.h"
 #include "CCLayerSorter.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCRenderSurface.h"
 #include "FloatQuad.h"
 #include "IntRect.h"

cc/layer_tree_host_common_unittest.cc

@@ -9,15 +9,15 @@
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerSorter.h"
+#include "CCMathUtil.h"
+#include "CCProxy.h"
 #include "CCSingleThreadProxy.h"
+#include "CCThread.h"
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
 #include "cc/layer.h"
-#include "cc/math_util.h"
-#include "cc/proxy.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/geometry_test_utils.h"
-#include "cc/thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>

cc/layer_tree_host_impl.cc

@@ -16,15 +16,15 @@
 #include "CCLayerIterator.h"
 #include "CCLayerTreeHost.h"
 #include "CCLayerTreeHostCommon.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCOverdrawMetrics.h"
 #include "CCPageScaleAnimation.h"
 #include "CCPrioritizedTextureManager.h"
 #include "CCRenderPassDrawQuad.h"
-#include "cc/gl_renderer.h"
-#include "cc/software_renderer.h"
-#include "cc/rendering_stats.h"
-#include "cc/scrollbar_animation_controller.h"
+#include "CCRendererGL.h"
+#include "CCRendererSoftware.h"
+#include "CCRenderingStats.h"
+#include "CCScrollbarAnimationController.h"
 #include "CCScrollbarLayerImpl.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"

cc/layer_tree_host_impl.h

@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "cc/animation_events.h"
+#include "CCAnimationEvents.h"
 #include "CCInputHandler.h"
 #include "CCLayerSorter.h"
 #include "CCRenderer.h"

cc/layer_tree_host_impl_unittest.cc

@@ -13,17 +13,17 @@
 #include "CCLayerTilingData.h"
 #include "CCQuadSink.h"
 #include "CCRenderPassDrawQuad.h"
-#include "cc/gl_renderer.h"
+#include "CCRendererGL.h"
 #include "CCScrollbarGeometryFixedThumb.h"
 #include "CCScrollbarLayerImpl.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
 #include "CCSolidColorDrawQuad.h"
 #include "CCTextureDrawQuad.h"
-#include "cc/texture_layer_impl.h"
-#include "cc/tile_draw_quad.h"
-#include "cc/tiled_layer_impl.h"
-#include "cc/video_layer_impl.h"
+#include "CCTextureLayerImpl.h"
+#include "CCTileDrawQuad.h"
+#include "CCTiledLayerImpl.h"
+#include "CCVideoLayerImpl.h"
 #include "base/hash_tables.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_web_compositor_output_surface.h"

cc/layer_tree_host_unittest.cc

@@ -10,6 +10,9 @@
 #include "CCLayerTreeHostImpl.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
+#include "CCTextureUpdateQueue.h"
+#include "CCThreadedTest.h"
+#include "CCTimingFunction.h"
 #include "Extensions3DChromium.h"
 #include "base/synchronization/lock.h"
 #include "cc/content_layer.h"
@@ -17,9 +20,6 @@
 #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 "cc/texture_update_queue.h"
-#include "cc/threaded_unittest.h"
-#include "cc/timing_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include <public/Platform.h>
 #include <public/WebLayerScrollClient.h>

cc/math_util.cc

@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 
 #include "FloatPoint.h"
 #include "FloatQuad.h"

cc/math_util_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 
 #include "FloatRect.h"
 #include "cc/test/geometry_test_utils.h"

cc/occlusion_tracker.cc

@@ -7,7 +7,7 @@
 #include "CCOcclusionTracker.h"
 
 #include "CCLayerImpl.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCOverdrawMetrics.h"
 #include "cc/layer.h"
 #include <algorithm>

cc/occlusion_tracker_unittest.cc

@@ -9,7 +9,7 @@
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHostCommon.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCOverdrawMetrics.h"
 #include "CCSingleThreadProxy.h"
 #include "Region.h"

cc/overdraw_metrics.cc

@@ -8,7 +8,7 @@
 
 #include "CCLayerTreeHost.h"
 #include "CCLayerTreeHostImpl.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "FloatQuad.h"
 #include "IntRect.h"
 #include "TraceEvent.h"

cc/prioritized_texture.cc

@@ -8,7 +8,7 @@
 
 #include "CCPrioritizedTextureManager.h"
 #include "CCPriorityCalculator.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
 #include <algorithm>
 
 using namespace std;

cc/prioritized_texture.h

@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "CCPriorityCalculator.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
 #include "CCTexture.h"
 #include "GraphicsContext3D.h"
 #include "IntRect.h"

cc/prioritized_texture_manager.cc

@@ -9,7 +9,7 @@
 #include "base/stl_util.h"
 #include "CCPrioritizedTexture.h"
 #include "CCPriorityCalculator.h"
-#include "cc/proxy.h"
+#include "CCProxy.h"
 #include "TraceEvent.h"
 #include <algorithm>
 

cc/program_binding.cc

@@ -6,10 +6,10 @@
 
 #include "cc/program_binding.h"
 
+#include "CCRendererGL.h" // For the GLC() macro.
 #include "GraphicsContext3D.h"
 #include "TraceEvent.h"
 #include "cc/geometry_binding.h"
-#include "cc/gl_renderer.h" // For the GLC() macro.
 #include <public/WebGraphicsContext3D.h>
 
 using WebKit::WebGraphicsContext3D;

cc/proxy.cc

@@ -4,9 +4,9 @@
 
 #include "config.h"
 
-#include "cc/proxy.h"
+#include "CCProxy.h"
 
-#include "cc/thread_task.h"
+#include "CCThreadTask.h"
 
 using namespace WTF;
 

cc/quad_culler_unittest.cc

@@ -8,12 +8,12 @@
 
 #include "CCAppendQuadsData.h"
 #include "CCLayerTilingData.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCOcclusionTracker.h"
 #include "CCOverdrawMetrics.h"
 #include "CCSingleThreadProxy.h"
-#include "cc/tile_draw_quad.h"
-#include "cc/tiled_layer_impl.h"
+#include "CCTileDrawQuad.h"
+#include "CCTiledLayerImpl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>

cc/rate_limiter.cc

@@ -6,8 +6,8 @@
 
 #include "cc/rate_limiter.h"
 
-#include "cc/proxy.h"
-#include "cc/thread.h"
+#include "CCProxy.h"
+#include "CCThread.h"
 #include "TraceEvent.h"
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/RefPtr.h>

cc/render_pass.cc

@@ -7,7 +7,7 @@
 #include "CCRenderPass.h"
 
 #include "CCLayerImpl.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCOcclusionTracker.h"
 #include "CCQuadCuller.h"
 #include "CCSharedQuadState.h"

cc/render_pass_draw_quad.h

@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "CCDrawQuad.h"
 #include "CCRenderPass.h"
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
 #include "IntRect.h"
 
 namespace cc {

cc/render_surface.cc

@@ -6,7 +6,7 @@
 
 #include "cc/render_surface.h"
 
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "cc/layer.h"
 #include <public/WebTransformationMatrix.h>
 

cc/render_surface_impl.cc

@@ -11,7 +11,7 @@
 #include "CCDebugBorderDrawQuad.h"
 #include "CCDelegatedRendererLayerImpl.h"
 #include "CCLayerImpl.h"
-#include "cc/math_util.h"
+#include "CCMathUtil.h"
 #include "CCQuadSink.h"
 #include "CCRenderPass.h"
 #include "CCRenderPassDrawQuad.h"

cc/resource_provider.cc

@@ -4,13 +4,15 @@
 
 #include "config.h"
 
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
 #ifdef LOG
 #undef LOG
 #endif
 
 #include <limits.h>
 
+#include "CCProxy.h"
+#include "CCRendererGL.h" // For the GLC() macro.
 #include "Extensions3DChromium.h"
 #include "IntRect.h"
 #include "base/debug/alias.h"
@@ -18,9 +20,7 @@
 #include "base/stl_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
-#include "cc/gl_renderer.h" // For the GLC() macro.
 #include "cc/layer_texture_sub_image.h"
-#include "cc/proxy.h"
 #include "cc/throttled_texture_uploader.h"
 #include "cc/unthrottled_texture_uploader.h"
 #include <public/WebGraphicsContext3D.h>

cc/resource_provider_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "cc/resource_provider.h"
+#include "CCResourceProvider.h"
 
 #include "CCGraphicsContext.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread

cc/scheduler.cc

@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "cc/scheduler.h"
+#include "CCScheduler.h"
 
 #include "TraceEvent.h"
 #include <base/auto_reset.h>

cc/scheduler.h

@@ -5,11 +5,11 @@
 #ifndef CCScheduler_h
 #define CCScheduler_h
 
-#include "CCFrameRateController.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "cc/scheduler_state_machine.h"
+#include "CCFrameRateController.h"
+#include "CCSchedulerStateMachine.h"
 
 namespace cc {
 

cc/scheduler_state_machine.cc

@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "cc/scheduler_state_machine.h"
+#include "CCSchedulerStateMachine.h"
 #include "base/stringprintf.h"
 
 

cc/scheduler_state_machine_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "cc/scheduler_state_machine.h"
+#include "CCSchedulerStateMachine.h"
 
 #include "testing/gtest/include/gtest/gtest.h"