cc: Remove CC*.h temporary includes, part 2/4.

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

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

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

49 files changed, 66 insertions, 136 deletions

diff --git a/cc/CCThread.h b/cc/CCThread.h
deleted file mode 100644
index aaa3579..0000000
--- a/cc/CCThread.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/thread.h"
diff --git a/cc/CCThreadProxy.h b/cc/CCThreadProxy.h
deleted file mode 100644
index 04899c0..0000000
--- a/cc/CCThreadProxy.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/thread_proxy.h"
diff --git a/cc/CCThreadTask.h b/cc/CCThreadTask.h
deleted file mode 100644
index 561156b7..0000000
--- a/cc/CCThreadTask.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/thread_task.h"
diff --git a/cc/CCTileDrawQuad.h b/cc/CCTileDrawQuad.h
deleted file mode 100644
index 584c439..0000000
--- a/cc/CCTileDrawQuad.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/tile_draw_quad.h"
diff --git a/cc/CCTiledLayerImpl.h b/cc/CCTiledLayerImpl.h
deleted file mode 100644
index b9726e2..0000000
--- a/cc/CCTiledLayerImpl.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/tiled_layer_impl.h"
diff --git a/cc/CCTimeSource.h b/cc/CCTimeSource.h
deleted file mode 100644
index e0fa624..0000000
--- a/cc/CCTimeSource.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/time_source.h"
diff --git a/cc/CCTimer.h b/cc/CCTimer.h
deleted file mode 100644
index 5dee85a..0000000
--- a/cc/CCTimer.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/timer.h"
diff --git a/cc/CCTimingFunction.h b/cc/CCTimingFunction.h
deleted file mode 100644
index 82dd931..0000000
--- a/cc/CCTimingFunction.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/timing_function.h"
diff --git a/cc/CCVideoLayerImpl.h b/cc/CCVideoLayerImpl.h
deleted file mode 100644
index f147549..0000000
--- a/cc/CCVideoLayerImpl.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/video_layer_impl.h"
diff --git a/cc/CCYUVVideoDrawQuad.h b/cc/CCYUVVideoDrawQuad.h
deleted file mode 100644
index ebdd1e5..0000000
--- a/cc/CCYUVVideoDrawQuad.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/yuv_video_draw_quad.h"
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 35156f5..ec12727 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -151,23 +151,23 @@
       'texture_update_controller.h',
       'texture_update_queue.cc',
       'texture_update_queue.h',
-      'CCThread.h',
+      'thread.h',
       'thread_proxy.cc',
-      'CCThreadProxy.h',
-      'CCThreadTask.h',
+      'thread_proxy.h',
+      'thread_task.h',
       'tile_draw_quad.cc',
-      'CCTileDrawQuad.h',
+      'tile_draw_quad.h',
       'tiled_layer_impl.cc',
-      'CCTiledLayerImpl.h',
-      'CCTimeSource.h',
+      'tiled_layer_impl.h',
+      'time_source.h',
       'timer.cc',
-      'CCTimer.h',
+      'timer.h',
       'timing_function.cc',
-      'CCTimingFunction.h',
+      'timing_function.h',
       'video_layer_impl.cc',
-      'CCVideoLayerImpl.h',
+      'video_layer_impl.h',
       'yuv_video_draw_quad.cc',
-      'CCYUVVideoDrawQuad.h',
+      'yuv_video_draw_quad.h',
       'canvas_layer_texture_updater.cc',
       'canvas_layer_texture_updater.h',
       'content_layer.cc',
@@ -285,16 +285,6 @@
       'scrollbar_layer_impl.h',
       'settings.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.h',
     ],
   },
   'targets': [
diff --git a/cc/delay_based_time_source.h b/cc/delay_based_time_source.h
index 8469ea1..0f818e3 100644
--- a/cc/delay_based_time_source.h
+++ b/cc/delay_based_time_source.h
@@ -5,8 +5,8 @@
 #ifndef CCDelayBasedTimeSource_h
 #define CCDelayBasedTimeSource_h
 
-#include "CCTimeSource.h"
-#include "CCTimer.h"
+#include "cc/time_source.h"
+#include "cc/timer.h"
 
 namespace cc {
 
diff --git a/cc/delay_based_time_source_unittest.cc b/cc/delay_based_time_source_unittest.cc
index f8976ae..ccd36f9 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 "CCThread.h"
 #include "cc/test/scheduler_test_common.h"
+#include "cc/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace cc;
diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc
index fe3bcdc..28a5a4a 100644
--- a/cc/draw_quad.cc
+++ b/cc/draw_quad.cc
@@ -10,12 +10,12 @@
 #include "CCDebugBorderDrawQuad.h"
 #include "CCIOSurfaceDrawQuad.h"
 #include "CCRenderPassDrawQuad.h"
-#include "CCTileDrawQuad.h"
-#include "CCYUVVideoDrawQuad.h"
 #include "base/logging.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/stream_video_draw_quad.h"
 #include "cc/texture_draw_quad.h"
+#include "cc/tile_draw_quad.h"
+#include "cc/yuv_video_draw_quad.h"
 
 namespace cc {
 
diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc
index 98ed3d5..fb1c8cd 100644
--- a/cc/draw_quad_unittest.cc
+++ b/cc/draw_quad_unittest.cc
@@ -10,12 +10,12 @@
 #include "CCDebugBorderDrawQuad.h"
 #include "CCIOSurfaceDrawQuad.h"
 #include "CCRenderPassDrawQuad.h"
-#include "CCTileDrawQuad.h"
-#include "CCYUVVideoDrawQuad.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/stream_video_draw_quad.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/texture_draw_quad.h"
+#include "cc/tile_draw_quad.h"
+#include "cc/yuv_video_draw_quad.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/frame_rate_controller.cc b/cc/frame_rate_controller.cc
index ba11e52..cd6fa2a 100644
--- a/cc/frame_rate_controller.cc
+++ b/cc/frame_rate_controller.cc
@@ -6,10 +6,10 @@
 
 #include "CCFrameRateController.h"
 
-#include "base/logging.h"
 #include "CCDelayBasedTimeSource.h"
-#include "CCTimeSource.h"
 #include "base/debug/trace_event.h"
+#include "base/logging.h"
+#include "cc/time_source.h"
 #include <wtf/CurrentTime.h>
 
 namespace {
diff --git a/cc/frame_rate_controller.h b/cc/frame_rate_controller.h
index 2352482..f9c2556 100644
--- a/cc/frame_rate_controller.h
+++ b/cc/frame_rate_controller.h
@@ -8,7 +8,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "CCTimer.h"
+#include "cc/timer.h"
 
 namespace cc {
 
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 8bb68fb..3fb1ccb 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -14,7 +14,6 @@
 #include "CCRenderSurfaceFilters.h"
 #include "CCScopedTexture.h"
 #include "CCSettings.h"
-#include "CCVideoLayerImpl.h"
 #include "FloatQuad.h"
 #include "GrTexture.h"
 #include "NotImplemented.h"
@@ -27,6 +26,7 @@
 #include "cc/single_thread_proxy.h"
 #include "cc/stream_video_draw_quad.h"
 #include "cc/texture_draw_quad.h"
+#include "cc/video_layer_impl.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h
index a255c9f..29310f6 100644
--- a/cc/gl_renderer.h
+++ b/cc/gl_renderer.h
@@ -11,9 +11,9 @@
 #include "CCIOSurfaceDrawQuad.h"
 #include "CCRenderPassDrawQuad.h"
 #include "CCRenderer.h"
-#include "CCTileDrawQuad.h"
-#include "CCYUVVideoDrawQuad.h"
 #include "cc/solid_color_draw_quad.h"
+#include "cc/tile_draw_quad.h"
+#include "cc/yuv_video_draw_quad.h"
 
 namespace WebKit {
 class WebGraphicsContext3D;
diff --git a/cc/keyframed_animation_curve.h b/cc/keyframed_animation_curve.h
index 066e5c6..236a20f 100644
--- a/cc/keyframed_animation_curve.h
+++ b/cc/keyframed_animation_curve.h
@@ -6,8 +6,8 @@
 #define CCKeyframedAnimationCurve_h
 
 #include "CCAnimationCurve.h"
-#include "CCTimingFunction.h"
-#include "scoped_ptr_vector.h"
+#include "cc/timing_function.h"
+#include "cc/scoped_ptr_vector.h"
 #include <public/WebTransformOperations.h>
 
 namespace cc {
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index f50ab4b..f418565 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -17,12 +17,12 @@
 #include "CCOcclusionTracker.h"
 #include "CCOverdrawMetrics.h"
 #include "CCSettings.h"
-#include "CCThreadProxy.h"
 #include "Region.h"
 #include "base/debug/trace_event.h"
 #include "cc/heads_up_display_layer.h"
 #include "cc/layer.h"
 #include "cc/single_thread_proxy.h"
+#include "cc/thread_proxy.h"
 #include "cc/tree_synchronizer.h"
 
 using namespace std;
diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc
index 2792b03..db13577 100644
--- a/cc/layer_tree_host_common_unittest.cc
+++ b/cc/layer_tree_host_common_unittest.cc
@@ -11,13 +11,13 @@
 #include "CCLayerSorter.h"
 #include "CCMathUtil.h"
 #include "CCProxy.h"
-#include "CCThread.h"
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
 #include "cc/layer.h"
 #include "cc/single_thread_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>
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 719ae40..4d2fe48 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -16,9 +16,6 @@
 #include "CCRendererGL.h"
 #include "CCScrollbarGeometryFixedThumb.h"
 #include "CCScrollbarLayerImpl.h"
-#include "CCTileDrawQuad.h"
-#include "CCTiledLayerImpl.h"
-#include "CCVideoLayerImpl.h"
 #include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "cc/settings.h"
@@ -34,6 +31,9 @@
 #include "cc/test/test_common.h"
 #include "cc/texture_draw_quad.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 "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 02a79c2..eee215e 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -10,7 +10,6 @@
 #include "CCLayerTreeHostImpl.h"
 #include "CCSettings.h"
 #include "CCThreadedTest.h"
-#include "CCTimingFunction.h"
 #include "base/synchronization/lock.h"
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
@@ -19,6 +18,7 @@
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/occlusion_tracker_test_common.h"
 #include "cc/texture_update_queue.h"
+#include "cc/timing_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
diff --git a/cc/proxy.cc b/cc/proxy.cc
index e9f0d09..d133da6 100644
--- a/cc/proxy.cc
+++ b/cc/proxy.cc
@@ -6,7 +6,7 @@
 
 #include "CCProxy.h"
 
-#include "CCThreadTask.h"
+#include "cc/thread_task.h"
 
 namespace cc {
 
diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc
index 64b2d70..7256bb8 100644
--- a/cc/quad_culler_unittest.cc
+++ b/cc/quad_culler_unittest.cc
@@ -11,9 +11,9 @@
 #include "CCMathUtil.h"
 #include "CCOcclusionTracker.h"
 #include "CCOverdrawMetrics.h"
-#include "CCTileDrawQuad.h"
-#include "CCTiledLayerImpl.h"
 #include "cc/single_thread_proxy.h"
+#include "cc/tile_draw_quad.h"
+#include "cc/tiled_layer_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/rate_limiter.cc b/cc/rate_limiter.cc
index 2fd4994..8b3d232 100644
--- a/cc/rate_limiter.cc
+++ b/cc/rate_limiter.cc
@@ -7,8 +7,8 @@
 #include "cc/rate_limiter.h"
 
 #include "CCProxy.h"
-#include "CCThread.h"
 #include "base/debug/trace_event.h"
+#include "cc/thread.h"
 #include <public/WebGraphicsContext3D.h>
 
 namespace cc {
diff --git a/cc/scoped_thread_proxy.h b/cc/scoped_thread_proxy.h
index c6ac440..dd59eee 100644
--- a/cc/scoped_thread_proxy.h
+++ b/cc/scoped_thread_proxy.h
@@ -5,9 +5,9 @@
 #ifndef CCScopedThreadProxy_h
 #define CCScopedThreadProxy_h
 
-#include "CCThreadTask.h"
 #include "base/logging.h"
 #include "base/threading/platform_thread.h"
+#include "cc/thread_task.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/ThreadSafeRefCounted.h>
diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc
index 4434d57..af9232f 100644
--- a/cc/single_thread_proxy.cc
+++ b/cc/single_thread_proxy.cc
@@ -9,9 +9,9 @@
 #include "CCDrawQuad.h"
 #include "CCGraphicsContext.h"
 #include "CCLayerTreeHost.h"
-#include "CCTimer.h"
 #include "base/debug/trace_event.h"
 #include "cc/texture_update_controller.h"
+#include "cc/timer.h"
 #include <wtf/CurrentTime.h>
 
 namespace cc {
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 3eda904..3625e37 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -8,9 +8,9 @@
 
 #include "CCDebugBorderDrawQuad.h"
 #include "CCRenderPassDrawQuad.h"
-#include "CCTileDrawQuad.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/texture_draw_quad.h"
+#include "cc/tile_draw_quad.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkMatrix.h"
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc
index e1c59a9..e9462cc 100644
--- a/cc/software_renderer_unittest.cc
+++ b/cc/software_renderer_unittest.cc
@@ -10,7 +10,6 @@
 #include "CCRenderPass.h"
 #include "CCRenderPassDrawQuad.h"
 #include "CCSettings.h"
-#include "CCTileDrawQuad.h"
 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
 #include "cc/solid_color_draw_quad.h"
 #include "cc/test/animation_test_common.h"
@@ -19,6 +18,7 @@
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/render_pass_test_common.h"
 #include "cc/test/test_common.h"
+#include "cc/tile_draw_quad.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index a151b4e..d815aa9 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -12,8 +12,6 @@
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHostImpl.h"
 #include "CCScopedThreadProxy.h"
-#include "CCThreadTask.h"
-#include "CCTimingFunction.h"
 #include "base/stl_util.h"
 #include "cc/content_layer.h"
 #include "cc/layer.h"
@@ -25,6 +23,8 @@
 #include "cc/test/occlusion_tracker_test_common.h"
 #include "cc/test/test_common.h"
 #include "cc/test/tiled_layer_test_common.h"
+#include "cc/thread_task.h"
+#include "cc/timing_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include <public/Platform.h>
 #include <public/WebCompositorSupport.h>
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index aeb0d55..2626d44 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -7,8 +7,8 @@
 
 #include "CCDelayBasedTimeSource.h"
 #include "CCFrameRateController.h"
-#include "CCThread.h"
 #include "base/threading/platform_thread.h"
+#include "cc/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <wtf/OwnPtr.h>
 
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 844688e..c4e9428 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -8,7 +8,6 @@
 #include "CCGraphicsContext.h"
 #include "CCPrioritizedTexture.h"
 #include "CCResourceProvider.h"
-#include "CCTiledLayerImpl.h"
 #include "IntRect.h"
 #include "IntSize.h"
 #include "Region.h"
@@ -17,6 +16,7 @@
 #include "cc/texture_update_queue.h"
 #include "cc/texture_uploader.h"
 #include "cc/tiled_layer.h"
+#include "cc/tiled_layer_impl.h"
 
 namespace WebKitTests {
 
diff --git a/cc/texture_update_controller.h b/cc/texture_update_controller.h
index a027fa6..dda1e30 100644
--- a/cc/texture_update_controller.h
+++ b/cc/texture_update_controller.h
@@ -5,11 +5,11 @@
 #ifndef CCTextureUpdateController_h
 #define CCTextureUpdateController_h
 
-#include "CCTimer.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/texture_update_queue.h"
+#include "cc/timer.h"
 
 namespace cc {
 
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
index 0263390..067281f 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCThreadProxy.h"
+#include "cc/thread_proxy.h"
 
 #include "CCDelayBasedTimeSource.h"
 #include "CCDrawQuad.h"
@@ -14,8 +14,8 @@
 #include "CCLayerTreeHost.h"
 #include "CCScheduler.h"
 #include "CCScopedThreadProxy.h"
-#include "CCThreadTask.h"
 #include "base/debug/trace_event.h"
+#include "cc/thread_task.h"
 #include <public/WebSharedGraphicsContext3D.h>
 #include <wtf/CurrentTime.h>
 
diff --git a/cc/thread_task.h b/cc/thread_task.h
index 25c5509..ae4c08e 100644
--- a/cc/thread_task.h
+++ b/cc/thread_task.h
@@ -4,7 +4,7 @@
 #ifndef CCThreadTask_h
 #define CCThreadTask_h
 
-#include "CCThread.h"
+#include "cc/thread.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 
diff --git a/cc/thread_task_unittest.cc b/cc/thread_task_unittest.cc
index 3f653d2..b00f0b2 100644
--- a/cc/thread_task_unittest.cc
+++ b/cc/thread_task_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCThreadTask.h"
+#include "cc/thread_task.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/tile_draw_quad.cc b/cc/tile_draw_quad.cc
index 1c61348..7618673 100644
--- a/cc/tile_draw_quad.cc
+++ b/cc/tile_draw_quad.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCTileDrawQuad.h"
+#include "cc/tile_draw_quad.h"
 
 #include "base/logging.h"
 #include "third_party/khronos/GLES2/gl2.h"
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index b28f1a6..ca8407c 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -9,9 +9,9 @@
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
 #include "CCOverdrawMetrics.h"
-#include "CCTiledLayerImpl.h"
 #include "Region.h"
 #include "base/basictypes.h"
+#include "cc/tiled_layer_impl.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
 using namespace std;
diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
index 206b2a1..a28d598 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/tiled_layer_impl.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCTiledLayerImpl.h"
+#include "cc/tiled_layer_impl.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCCheckerboardDrawQuad.h"
@@ -12,11 +12,11 @@
 #include "CCLayerTilingData.h"
 #include "CCMathUtil.h"
 #include "CCQuadSink.h"
-#include "CCTileDrawQuad.h"
 #include "FloatQuad.h"
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
 #include "cc/solid_color_draw_quad.h"
+#include "cc/tile_draw_quad.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkColor.h"
 
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc
index 0bfceb0..d242463 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/tiled_layer_impl_unittest.cc
@@ -4,14 +4,14 @@
 
 #include "config.h"
 
-#include "CCTiledLayerImpl.h"
+#include "cc/tiled_layer_impl.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCLayerTilingData.h"
-#include "CCTileDrawQuad.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/layer_test_common.h"
 #include "cc/test/mock_quad_culler.h"
+#include "cc/tile_draw_quad.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/timer.cc b/cc/timer.cc
index b5b9206..59561c2 100644
--- a/cc/timer.cc
+++ b/cc/timer.cc
@@ -4,11 +4,11 @@
 
 #include "config.h"
 
-#include "CCTimer.h"
+#include "cc/timer.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "CCThread.h"
+#include "cc/thread.h"
 
 namespace cc {
 
diff --git a/cc/timer_unittest.cc b/cc/timer_unittest.cc
index 3cc497f..4be6e6e 100644
--- a/cc/timer_unittest.cc
+++ b/cc/timer_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCTimer.h"
+#include "cc/timer.h"
 
 #include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/timing_function.cc b/cc/timing_function.cc
index 3a4ecd4..86457d5 100644
--- a/cc/timing_function.cc
+++ b/cc/timing_function.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCTimingFunction.h"
+#include "cc/timing_function.h"
 
 namespace {
 const double epsilon = 1e-6;
diff --git a/cc/video_layer.cc b/cc/video_layer.cc
index 459c6dc..f1cb332 100644
--- a/cc/video_layer.cc
+++ b/cc/video_layer.cc
@@ -6,7 +6,7 @@
 
 #include "cc/video_layer.h"
 
-#include "CCVideoLayerImpl.h"
+#include "cc/video_layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc
index 3f0f78b..6f796e3 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/video_layer_impl.cc
@@ -4,19 +4,19 @@
 
 #include "config.h"
 
-#include "CCVideoLayerImpl.h"
+#include "cc/video_layer_impl.h"
 
-#include "third_party/khronos/GLES2/gl2ext.h"
-#include "third_party/khronos/GLES2/gl2.h"
 #include "CCIOSurfaceDrawQuad.h"
 #include "CCLayerTreeHostImpl.h"
 #include "CCProxy.h"
 #include "CCQuadSink.h"
 #include "CCResourceProvider.h"
-#include "CCYUVVideoDrawQuad.h"
 #include "NotImplemented.h"
 #include "cc/stream_video_draw_quad.h"
 #include "cc/texture_draw_quad.h"
+#include "cc/yuv_video_draw_quad.h"
+#include "third_party/khronos/GLES2/gl2.h"
+#include "third_party/khronos/GLES2/gl2ext.h"
 #include <public/WebVideoFrame.h>
 
 namespace cc {
diff --git a/cc/yuv_video_draw_quad.cc b/cc/yuv_video_draw_quad.cc
index 586e7fc..db655f0 100644
--- a/cc/yuv_video_draw_quad.cc
+++ b/cc/yuv_video_draw_quad.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCYUVVideoDrawQuad.h"
+#include "cc/yuv_video_draw_quad.h"
 
 #include "base/logging.h"
 
diff --git a/cc/yuv_video_draw_quad.h b/cc/yuv_video_draw_quad.h
index 3b3fa5d..1068a4b 100644
--- a/cc/yuv_video_draw_quad.h
+++ b/cc/yuv_video_draw_quad.h
@@ -5,10 +5,10 @@
 #ifndef CCYUVVideoDrawQuad_h
 #define CCYUVVideoDrawQuad_h
 
+#include "CCDrawQuad.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "CCDrawQuad.h"
-#include "CCVideoLayerImpl.h"
+#include "cc/video_layer_impl.h"
 
 namespace cc {