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

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


Review URL: https://chromiumcodereview.appspot.com/11228059

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

95 files changed, 140 insertions, 268 deletions

diff --git a/cc/CCActiveAnimation.h b/cc/CCActiveAnimation.h
deleted file mode 100644
index e5737a8..0000000
--- a/cc/CCActiveAnimation.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/active_animation.h"
diff --git a/cc/CCAnimationCurve.h b/cc/CCAnimationCurve.h
deleted file mode 100644
index 71cd0fa..0000000
--- a/cc/CCAnimationCurve.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/animation_curve.h"
diff --git a/cc/CCAnimationEvents.h b/cc/CCAnimationEvents.h
deleted file mode 100644
index 988f56e..0000000
--- a/cc/CCAnimationEvents.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/animation_events.h"
diff --git a/cc/CCAppendQuadsData.h b/cc/CCAppendQuadsData.h
deleted file mode 100644
index 7a11591..0000000
--- a/cc/CCAppendQuadsData.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/append_quads_data.h"
diff --git a/cc/CCCheckerboardDrawQuad.h b/cc/CCCheckerboardDrawQuad.h
deleted file mode 100644
index ceb42db..0000000
--- a/cc/CCCheckerboardDrawQuad.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/checkerboard_draw_quad.h"
diff --git a/cc/CCCompletionEvent.h b/cc/CCCompletionEvent.h
deleted file mode 100644
index f422075..0000000
--- a/cc/CCCompletionEvent.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/completion_event.h"
diff --git a/cc/CCDamageTracker.h b/cc/CCDamageTracker.h
deleted file mode 100644
index 5e48bc6..0000000
--- a/cc/CCDamageTracker.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/damage_tracker.h"
diff --git a/cc/CCDebugBorderDrawQuad.h b/cc/CCDebugBorderDrawQuad.h
deleted file mode 100644
index 3b275fa..0000000
--- a/cc/CCDebugBorderDrawQuad.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/debug_border_draw_quad.h"
diff --git a/cc/CCDebugRectHistory.h b/cc/CCDebugRectHistory.h
deleted file mode 100644
index 690febe..0000000
--- a/cc/CCDebugRectHistory.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/debug_rect_history.h"
diff --git a/cc/CCDelayBasedTimeSource.h b/cc/CCDelayBasedTimeSource.h
deleted file mode 100644
index 249666c1..0000000
--- a/cc/CCDelayBasedTimeSource.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/delay_based_time_source.h"
diff --git a/cc/CCDelegatedRendererLayerImpl.h b/cc/CCDelegatedRendererLayerImpl.h
deleted file mode 100644
index 08952e3..0000000
--- a/cc/CCDelegatedRendererLayerImpl.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/delegated_renderer_layer_impl.h"
diff --git a/cc/CCDirectRenderer.h b/cc/CCDirectRenderer.h
deleted file mode 100644
index 3e61292..0000000
--- a/cc/CCDirectRenderer.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/direct_renderer.h"
diff --git a/cc/CCDrawQuad.h b/cc/CCDrawQuad.h
deleted file mode 100644
index ca1a094..0000000
--- a/cc/CCDrawQuad.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/draw_quad.h"
diff --git a/cc/CCFontAtlas.h b/cc/CCFontAtlas.h
deleted file mode 100644
index 18463e4..0000000
--- a/cc/CCFontAtlas.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/font_atlas.h"
diff --git a/cc/CCFrameRateController.h b/cc/CCFrameRateController.h
deleted file mode 100644
index e8d28b53..0000000
--- a/cc/CCFrameRateController.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/frame_rate_controller.h"
diff --git a/cc/CCFrameRateCounter.h b/cc/CCFrameRateCounter.h
deleted file mode 100644
index 1a4708c..0000000
--- a/cc/CCFrameRateCounter.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/frame_rate_counter.h"
diff --git a/cc/CCGraphicsContext.h b/cc/CCGraphicsContext.h
deleted file mode 100644
index 1193f1f..0000000
--- a/cc/CCGraphicsContext.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/graphics_context.h"
diff --git a/cc/CCLayerQuad.h b/cc/CCLayerQuad.h
deleted file mode 100644
index 813ee03..0000000
--- a/cc/CCLayerQuad.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/layer_quad.h"
diff --git a/cc/CCThreadedTest.h b/cc/CCThreadedTest.h
deleted file mode 100644
index afaf257..0000000
--- a/cc/CCThreadedTest.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_tree_test_common.h"
diff --git a/cc/active_animation.cc b/cc/active_animation.cc
index 9721bdb..6346d1b 100644
--- a/cc/active_animation.cc
+++ b/cc/active_animation.cc
@@ -4,12 +4,13 @@
 
 #include "config.h"
 
-#include "CCActiveAnimation.h"
+#include "cc/active_animation.h"
+
+#include <cmath>
 
-#include "CCAnimationCurve.h"
 #include "base/debug/trace_event.h"
 #include "base/string_util.h"
-#include <cmath>
+#include "cc/animation_curve.h"
 
 namespace {
 
diff --git a/cc/active_animation_unittest.cc b/cc/active_animation_unittest.cc
index 919f2a2..b2a2f8d 100644
--- a/cc/active_animation_unittest.cc
+++ b/cc/active_animation_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCActiveAnimation.h"
+#include "cc/active_animation.h"
 
 #include "cc/test/animation_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/animation_curve.cc b/cc/animation_curve.cc
index eaeaa85..de8be1b 100644
--- a/cc/animation_curve.cc
+++ b/cc/animation_curve.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCAnimationCurve.h"
+#include "cc/animation_curve.h"
 
 #include "base/logging.h"
 
@@ -32,4 +32,4 @@ AnimationCurve::Type TransformAnimationCurve::type() const
     return Transform;
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/animation_events.h b/cc/animation_events.h
index 52c99d3..5cfd36a 100644
--- a/cc/animation_events.h
+++ b/cc/animation_events.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "CCActiveAnimation.h"
+#include "cc/active_animation.h"
 
 namespace cc {
 
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 1a13f3c..abdd916 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -16,35 +16,35 @@
       'caching_bitmap_canvas_layer_updater.cc',
       'caching_bitmap_canvas_layer_updater.h',
       'active_animation.cc',
-      'CCActiveAnimation.h',
-      'CCAppendQuadsData.h',
+      'active_animation.h',
+      'append_quads_data.h',
       'animation_curve.cc',
-      'CCAnimationCurve.h',
-      'CCAnimationEvents.h',
+      'animation_curve.h',
+      'animation_events.h',
       'checkerboard_draw_quad.cc',
-      'CCCheckerboardDrawQuad.h',
-      'CCCompletionEvent.h',
+      'checkerboard_draw_quad.h',
+      'completion_event.h',
       'damage_tracker.cc',
-      'CCDamageTracker.h',
+      'damage_tracker.h',
       'debug_border_draw_quad.cc',
-      'CCDebugBorderDrawQuad.h',
+      'debug_border_draw_quad.h',
       'debug_rect_history.cc',
-      'CCDebugRectHistory.h',
+      'debug_rect_history.h',
       'delay_based_time_source.cc',
-      'CCDelayBasedTimeSource.h',
+      'delay_based_time_source.h',
       'delegated_renderer_layer_impl.cc',
-      'CCDelegatedRendererLayerImpl.h',
+      'delegated_renderer_layer_impl.h',
       'direct_renderer.cc',
-      'CCDirectRenderer.h',
+      'direct_renderer.h',
       'draw_quad.cc',
-      'CCDrawQuad.h',
+      'draw_quad.h',
       'font_atlas.cc',
-      'CCFontAtlas.h',
+      'font_atlas.h',
       'frame_rate_controller.cc',
-      'CCFrameRateController.h',
+      'frame_rate_controller.h',
       'frame_rate_counter.cc',
-      'CCFrameRateCounter.h',
-      'CCGraphicsContext.h',
+      'frame_rate_counter.h',
+      'graphics_context.h',
       'heads_up_display_layer_impl.cc',
       'heads_up_display_layer_impl.h',
       'io_surface_draw_quad.cc',
@@ -221,23 +221,6 @@
       'video_layer.cc',
       'video_layer.h',
 
-      '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',
       'resource_update.h',
       'threaded_test.h',
     ],
diff --git a/cc/checkerboard_draw_quad.cc b/cc/checkerboard_draw_quad.cc
index 24f9d6d..6956494 100644
--- a/cc/checkerboard_draw_quad.cc
+++ b/cc/checkerboard_draw_quad.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCCheckerboardDrawQuad.h"
+#include "cc/checkerboard_draw_quad.h"
 
 #include "base/logging.h"
 
diff --git a/cc/checkerboard_draw_quad.h b/cc/checkerboard_draw_quad.h
index 7f87c1b..6a01d51 100644
--- a/cc/checkerboard_draw_quad.h
+++ b/cc/checkerboard_draw_quad.h
@@ -5,8 +5,8 @@
 #ifndef CCCheckerboardDrawQuad_h
 #define CCCheckerboardDrawQuad_h
 
-#include "CCDrawQuad.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {
diff --git a/cc/damage_tracker.cc b/cc/damage_tracker.cc
index 2528db6..4c27d4d 100644
--- a/cc/damage_tracker.cc
+++ b/cc/damage_tracker.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCDamageTracker.h"
+#include "cc/damage_tracker.h"
 
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host_common.h"
diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc
index dbc0fb0..69b474b 100644
--- a/cc/damage_tracker_unittest.cc
+++ b/cc/damage_tracker_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCDamageTracker.h"
+#include "cc/damage_tracker.h"
 
 #include "cc/layer_impl.h"
 #include "cc/layer_sorter.h"
diff --git a/cc/debug_border_draw_quad.cc b/cc/debug_border_draw_quad.cc
index 8177c33..9f73ac6 100644
--- a/cc/debug_border_draw_quad.cc
+++ b/cc/debug_border_draw_quad.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCDebugBorderDrawQuad.h"
+#include "cc/debug_border_draw_quad.h"
 
 #include "base/logging.h"
 
diff --git a/cc/debug_border_draw_quad.h b/cc/debug_border_draw_quad.h
index 07e4ab8..bbe47e4 100644
--- a/cc/debug_border_draw_quad.h
+++ b/cc/debug_border_draw_quad.h
@@ -5,8 +5,8 @@
 #ifndef CCDebugBorderDrawQuad_h
 #define CCDebugBorderDrawQuad_h
 
-#include "CCDrawQuad.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {
diff --git a/cc/debug_rect_history.cc b/cc/debug_rect_history.cc
index 928b568..41c0d8a 100644
--- a/cc/debug_rect_history.cc
+++ b/cc/debug_rect_history.cc
@@ -4,9 +4,9 @@
 
 #include "config.h"
 
-#include "CCDebugRectHistory.h"
+#include "cc/debug_rect_history.h"
 
-#include "CCDamageTracker.h"
+#include "cc/damage_tracker.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host.h"
 #include "cc/math_util.h"
diff --git a/cc/delay_based_time_source.cc b/cc/delay_based_time_source.cc
index 397027f..9d17b07 100644
--- a/cc/delay_based_time_source.cc
+++ b/cc/delay_based_time_source.cc
@@ -4,11 +4,12 @@
 
 #include "config.h"
 
-#include "CCDelayBasedTimeSource.h"
+#include "cc/delay_based_time_source.h"
+
+#include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
-#include <algorithm>
 #include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 
diff --git a/cc/delay_based_time_source_unittest.cc b/cc/delay_based_time_source_unittest.cc
index 1fc9aa5..60c9d45c 100644
--- a/cc/delay_based_time_source_unittest.cc
+++ b/cc/delay_based_time_source_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCDelayBasedTimeSource.h"
+#include "cc/delay_based_time_source.h"
 
 #include "cc/test/scheduler_test_common.h"
 #include "cc/thread.h"
diff --git a/cc/delegated_renderer_layer.cc b/cc/delegated_renderer_layer.cc
index 33f28ce..12eabe4 100644
--- a/cc/delegated_renderer_layer.cc
+++ b/cc/delegated_renderer_layer.cc
@@ -3,9 +3,10 @@
 // found in the LICENSE file.
 
 #include "config.h"
+
 #include "cc/delegated_renderer_layer.h"
 
-#include "CCDelegatedRendererLayerImpl.h"
+#include "cc/delegated_renderer_layer_impl.h"
 
 namespace cc {
 
@@ -30,4 +31,4 @@ scoped_ptr<LayerImpl> DelegatedRendererLayer::createLayerImpl()
     return DelegatedRendererLayerImpl::create(m_layerId).PassAs<LayerImpl>();
 }
 
-}
+}  // namespace cc
diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc
index 4101ab7..693bd58 100644
--- a/cc/delegated_renderer_layer_impl.cc
+++ b/cc/delegated_renderer_layer_impl.cc
@@ -4,9 +4,9 @@
 
 #include "config.h"
 
-#include "CCDelegatedRendererLayerImpl.h"
+#include "cc/delegated_renderer_layer_impl.h"
 
-#include "CCAppendQuadsData.h"
+#include "cc/append_quads_data.h"
 #include "cc/math_util.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass_draw_quad.h"
diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc
index 0c61552..8e3b43e 100644
--- a/cc/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/delegated_renderer_layer_impl_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "config.h"
 
-#include "CCDelegatedRendererLayerImpl.h"
+#include "cc/delegated_renderer_layer_impl.h"
 
-#include "CCAppendQuadsData.h"
+#include "cc/append_quads_data.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass_draw_quad.h"
diff --git a/cc/direct_renderer.cc b/cc/direct_renderer.cc
index d38834d..ac3ea3c3 100644
--- a/cc/direct_renderer.cc
+++ b/cc/direct_renderer.cc
@@ -4,12 +4,13 @@
 
 #include "config.h"
 
-#include "CCDirectRenderer.h"
+#include "cc/direct_renderer.h"
+
+#include <vector>
 
 #include "cc/math_util.h"
 #include "ui/gfx/rect_conversions.h"
 #include <public/WebTransformationMatrix.h>
-#include <vector>
 
 using WebKit::WebTransformationMatrix;
 
diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc
index 9250274..e350c69 100644
--- a/cc/draw_quad.cc
+++ b/cc/draw_quad.cc
@@ -4,11 +4,11 @@
 
 #include "config.h"
 
-#include "CCDrawQuad.h"
+#include "cc/draw_quad.h"
 
-#include "CCCheckerboardDrawQuad.h"
-#include "CCDebugBorderDrawQuad.h"
 #include "base/logging.h"
+#include "cc/checkerboard_draw_quad.h"
+#include "cc/debug_border_draw_quad.h"
 #include "cc/io_surface_draw_quad.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/solid_color_draw_quad.h"
diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc
index 0a56fa6..f53d135 100644
--- a/cc/draw_quad_unittest.cc
+++ b/cc/draw_quad_unittest.cc
@@ -4,10 +4,10 @@
 
 #include "config.h"
 
-#include "CCDrawQuad.h"
+#include "cc/draw_quad.h"
 
-#include "CCCheckerboardDrawQuad.h"
-#include "CCDebugBorderDrawQuad.h"
+#include "cc/checkerboard_draw_quad.h"
+#include "cc/debug_border_draw_quad.h"
 #include "cc/io_surface_draw_quad.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/solid_color_draw_quad.h"
diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc
index 0b483c9..d8294da 100644
--- a/cc/font_atlas.cc
+++ b/cc/font_atlas.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCFontAtlas.h"
+#include "cc/font_atlas.h"
 
 #include <vector>
 
diff --git a/cc/frame_rate_controller.cc b/cc/frame_rate_controller.cc
index a47f0d1..ae095c7 100644
--- a/cc/frame_rate_controller.cc
+++ b/cc/frame_rate_controller.cc
@@ -4,11 +4,11 @@
 
 #include "config.h"
 
-#include "CCFrameRateController.h"
+#include "cc/frame_rate_controller.h"
 
-#include "CCDelayBasedTimeSource.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
+#include "cc/delay_based_time_source.h"
 #include "cc/time_source.h"
 #include <wtf/CurrentTime.h>
 
diff --git a/cc/frame_rate_controller_unittest.cc b/cc/frame_rate_controller_unittest.cc
index f3af465..7becaa2 100644
--- a/cc/frame_rate_controller_unittest.cc
+++ b/cc/frame_rate_controller_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCFrameRateController.h"
+#include "cc/frame_rate_controller.h"
 
 #include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/frame_rate_counter.cc b/cc/frame_rate_counter.cc
index 7ff1edc..46b51f4 100644
--- a/cc/frame_rate_counter.cc
+++ b/cc/frame_rate_counter.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCFrameRateCounter.h"
+#include "cc/frame_rate_counter.h"
 
 #include <cmath>
 
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 361ced1..b059d76 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -6,13 +6,13 @@
 
 #include "cc/gl_renderer.h"
 
-#include "CCDamageTracker.h"
 #include "FloatQuad.h"
 #include "NotImplemented.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "cc/damage_tracker.h"
 #include "cc/geometry_binding.h"
 #include "cc/layer_quad.h"
 #include "cc/math_util.h"
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h
index e68e944..0a5ec31 100644
--- a/cc/gl_renderer.h
+++ b/cc/gl_renderer.h
@@ -5,9 +5,9 @@
 #ifndef CCRendererGL_h
 #define CCRendererGL_h
 
-#include "CCCheckerboardDrawQuad.h"
-#include "CCDebugBorderDrawQuad.h"
-#include "CCDirectRenderer.h"
+#include "cc/checkerboard_draw_quad.h"
+#include "cc/debug_border_draw_quad.h"
+#include "cc/direct_renderer.h"
 #include "cc/io_surface_draw_quad.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/renderer.h"
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index e20dd25..9ada691 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -5,7 +5,7 @@
 #include "config.h"
 #include "cc/gl_renderer.h"
 
-#include "CCDrawQuad.h"
+#include "cc/draw_quad.h"
 #include "cc/prioritized_texture_manager.h"
 #include "cc/resource_provider.h"
 #include "cc/settings.h"
diff --git a/cc/heads_up_display_layer.h b/cc/heads_up_display_layer.h
index 23d514b..23e4470 100644
--- a/cc/heads_up_display_layer.h
+++ b/cc/heads_up_display_layer.h
@@ -5,9 +5,9 @@
 #ifndef HeadsUpDisplayLayerChromium_h
 #define HeadsUpDisplayLayerChromium_h
 
-#include "CCFontAtlas.h"
 #include "IntSize.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/font_atlas.h"
 #include "cc/layer.h"
 
 namespace cc {
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
index dacc5fb..c64c034 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/heads_up_display_layer_impl.cc
@@ -6,10 +6,10 @@
 
 #include "cc/heads_up_display_layer_impl.h"
 
-#include "CCDebugRectHistory.h"
-#include "CCFontAtlas.h"
-#include "CCFrameRateCounter.h"
 #include "base/stringprintf.h"
+#include "cc/debug_rect_history.h"
+#include "cc/font_atlas.h"
+#include "cc/frame_rate_counter.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/quad_sink.h"
 #include "cc/texture_draw_quad.h"
diff --git a/cc/heads_up_display_layer_impl.h b/cc/heads_up_display_layer_impl.h
index 28b4383..b17644a 100644
--- a/cc/heads_up_display_layer_impl.h
+++ b/cc/heads_up_display_layer_impl.h
@@ -5,8 +5,8 @@
 #ifndef CCHeadsUpDisplayLayerImpl_h
 #define CCHeadsUpDisplayLayerImpl_h
 
-#include "CCFontAtlas.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/font_atlas.h"
 #include "cc/layer_impl.h"
 #include "cc/scoped_texture.h"
 
diff --git a/cc/heads_up_display_unittest.cc b/cc/heads_up_display_unittest.cc
index 7c46751..5603fc6 100644
--- a/cc/heads_up_display_unittest.cc
+++ b/cc/heads_up_display_unittest.cc
@@ -4,10 +4,10 @@
 
 #include "config.h"
 
-#include "CCThreadedTest.h"
 #include "cc/heads_up_display_layer.h"
 #include "cc/layer.h"
 #include "cc/layer_tree_host.h"
+#include "cc/test/layer_tree_test_common.h"
 
 using namespace cc;
 using namespace WebKitTests;
diff --git a/cc/io_surface_draw_quad.h b/cc/io_surface_draw_quad.h
index 30574a4..02d3086 100644
--- a/cc/io_surface_draw_quad.h
+++ b/cc/io_surface_draw_quad.h
@@ -5,8 +5,8 @@
 #ifndef CCIOSurfaceDrawQuad_h
 #define CCIOSurfaceDrawQuad_h
 
-#include "CCDrawQuad.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
 #include "ui/gfx/size.h"
 
 namespace cc {
diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc
index 7ee16b3..c80e092 100644
--- a/cc/io_surface_layer_impl.cc
+++ b/cc/io_surface_layer_impl.cc
@@ -6,9 +6,9 @@
 
 #include "cc/io_surface_layer_impl.h"
 
-#include "CCGraphicsContext.h"
 #include "base/stringprintf.h"
 #include "cc/gl_renderer.h" // For the GLC() macro.
+#include "cc/graphics_context.h"
 #include "cc/io_surface_draw_quad.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/quad_sink.h"
diff --git a/cc/keyframed_animation_curve.h b/cc/keyframed_animation_curve.h
index 881ef03..7583f32 100644
--- a/cc/keyframed_animation_curve.h
+++ b/cc/keyframed_animation_curve.h
@@ -5,9 +5,9 @@
 #ifndef CCKeyframedAnimationCurve_h
 #define CCKeyframedAnimationCurve_h
 
-#include "CCAnimationCurve.h"
-#include "cc/timing_function.h"
+#include "cc/animation_curve.h"
 #include "cc/scoped_ptr_vector.h"
+#include "cc/timing_function.h"
 #include <public/WebTransformOperations.h>
 
 namespace cc {
@@ -104,6 +104,6 @@ private:
     ScopedPtrVector<TransformKeyframe> m_keyframes;
 };
 
-} // namespace cc
+}  // namespace cc
 
 #endif // CCKeyframedAnimationCurve_h
diff --git a/cc/layer.cc b/cc/layer.cc
index f8953424..62e5c86 100644
--- a/cc/layer.cc
+++ b/cc/layer.cc
@@ -6,8 +6,8 @@
 
 #include "cc/layer.h"
 
-#include "CCActiveAnimation.h"
-#include "CCAnimationEvents.h"
+#include "cc/active_animation.h"
+#include "cc/animation_events.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host.h"
diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc
index 5b50db4..876ac9f 100644
--- a/cc/layer_animation_controller.cc
+++ b/cc/layer_animation_controller.cc
@@ -6,7 +6,7 @@
 
 #include "cc/layer_animation_controller.h"
 
-#include "CCActiveAnimation.h"
+#include "cc/active_animation.h"
 #include "cc/keyframed_animation_curve.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/layer_animation_controller.h b/cc/layer_animation_controller.h
index ff6a359..25e4c58 100644
--- a/cc/layer_animation_controller.h
+++ b/cc/layer_animation_controller.h
@@ -5,7 +5,7 @@
 #ifndef CCLayerAnimationController_h
 #define CCLayerAnimationController_h
 
-#include "CCAnimationEvents.h"
+#include "cc/animation_events.h"
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
diff --git a/cc/layer_animation_controller_unittest.cc b/cc/layer_animation_controller_unittest.cc
index b090b63..5c9402a 100644
--- a/cc/layer_animation_controller_unittest.cc
+++ b/cc/layer_animation_controller_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "cc/layer_animation_controller.h"
 
-#include "CCActiveAnimation.h"
-#include "CCAnimationCurve.h"
+#include "cc/active_animation.h"
+#include "cc/animation_curve.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/layer_impl.cc b/cc/layer_impl.cc
index 96f197b..3de9483 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -6,9 +6,9 @@
 
 #include "cc/layer_impl.h"
 
-#include "CCDebugBorderDrawQuad.h"
 #include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
+#include "cc/debug_border_draw_quad.h"
 #include "cc/layer_sorter.h"
 #include "cc/math_util.h"
 #include "cc/proxy.h"
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index ebc998e..cde1075 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -6,10 +6,10 @@
 
 #include "cc/layer_tree_host.h"
 
-#include "CCFontAtlas.h"
-#include "CCGraphicsContext.h"
 #include "Region.h"
 #include "base/debug/trace_event.h"
+#include "cc/font_atlas.h"
+#include "cc/graphics_context.h"
 #include "cc/heads_up_display_layer.h"
 #include "cc/heads_up_display_layer_impl.h"
 #include "cc/layer.h"
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index 1f58952..c80e79d 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -7,13 +7,13 @@
 
 #include <limits>
 
-#include "CCAnimationEvents.h"
-#include "CCGraphicsContext.h"
 #include "IntRect.h"
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/animation_events.h"
+#include "cc/graphics_context.h"
 #include "cc/layer_tree_host_client.h"
 #include "cc/layer_tree_host_common.h"
 #include "cc/occlusion_tracker.h"
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index a87302e..af13254 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -6,14 +6,14 @@
 
 #include "cc/layer_tree_host_impl.h"
 
-#include "CCAppendQuadsData.h"
-#include "CCDamageTracker.h"
-#include "CCDebugRectHistory.h"
-#include "CCDelayBasedTimeSource.h"
-#include "CCFontAtlas.h"
-#include "CCFrameRateCounter.h"
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
+#include "cc/append_quads_data.h"
+#include "cc/damage_tracker.h"
+#include "cc/debug_rect_history.h"
+#include "cc/delay_based_time_source.h"
+#include "cc/font_atlas.h"
+#include "cc/frame_rate_counter.h"
 #include "cc/gl_renderer.h"
 #include "cc/heads_up_display_layer_impl.h"
 #include "cc/layer_iterator.h"
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index 17ef602..7ce1d31 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -5,10 +5,10 @@
 #ifndef CCLayerTreeHostImpl_h
 #define CCLayerTreeHostImpl_h
 
-#include "CCAnimationEvents.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
+#include "cc/animation_events.h"
 #include "cc/input_handler.h"
 #include "cc/layer_sorter.h"
 #include "cc/render_pass.h"
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 9611d68..f178224 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -6,9 +6,9 @@
 
 #include "cc/layer_tree_host_impl.h"
 
-#include "CCDelegatedRendererLayerImpl.h"
 #include "base/command_line.h"
 #include "base/hash_tables.h"
+#include "cc/delegated_renderer_layer_impl.h"
 #include "cc/gl_renderer.h"
 #include "cc/heads_up_display_layer_impl.h"
 #include "cc/io_surface_layer_impl.h"
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index a03e418..00d468d 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -6,16 +6,16 @@
 
 #include "cc/layer_tree_host.h"
 
-#include "CCGraphicsContext.h"
-#include "CCThreadedTest.h"
 #include "base/synchronization/lock.h"
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
+#include "cc/graphics_context.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/settings.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include "cc/test/geometry_test_utils.h"
+#include "cc/test/layer_tree_test_common.h"
 #include "cc/test/occlusion_tracker_test_common.h"
 #include "cc/texture_update_queue.h"
 #include "cc/timing_function.h"
diff --git a/cc/quad_culler.cc b/cc/quad_culler.cc
index 8698df7..103489b 100644
--- a/cc/quad_culler.cc
+++ b/cc/quad_culler.cc
@@ -6,9 +6,9 @@
 
 #include "cc/quad_culler.h"
 
-#include "CCAppendQuadsData.h"
-#include "CCDebugBorderDrawQuad.h"
 #include "Region.h"
+#include "cc/append_quads_data.h"
+#include "cc/debug_border_draw_quad.h"
 #include "cc/layer_impl.h"
 #include "cc/occlusion_tracker.h"
 #include "cc/overdraw_metrics.h"
diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc
index 0adaadb..6aaddd5 100644
--- a/cc/quad_culler_unittest.cc
+++ b/cc/quad_culler_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "cc/quad_culler.h"
 
-#include "CCAppendQuadsData.h"
+#include "cc/append_quads_data.h"
 #include "cc/layer_tiling_data.h"
 #include "cc/math_util.h"
 #include "cc/occlusion_tracker.h"
diff --git a/cc/render_pass.h b/cc/render_pass.h
index 076cfe4..fdcd724 100644
--- a/cc/render_pass.h
+++ b/cc/render_pass.h
@@ -5,9 +5,9 @@
 #ifndef CCRenderPass_h
 #define CCRenderPass_h
 
-#include "CCDrawQuad.h"
 #include "FloatRect.h"
 #include "base/basictypes.h"
+#include "cc/draw_quad.h"
 #include "cc/hash_pair.h"
 #include "cc/scoped_ptr_hash_map.h"
 #include "cc/scoped_ptr_vector.h"
diff --git a/cc/render_pass_draw_quad.h b/cc/render_pass_draw_quad.h
index 20e4e0f..67955b0 100644
--- a/cc/render_pass_draw_quad.h
+++ b/cc/render_pass_draw_quad.h
@@ -5,9 +5,9 @@
 #ifndef CCRenderPassDrawQuad_h
 #define CCRenderPassDrawQuad_h
 
-#include "CCDrawQuad.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
 #include "cc/render_pass.h"
 #include "cc/resource_provider.h"
 
diff --git a/cc/render_pass_unittest.cc b/cc/render_pass_unittest.cc
index acd5ad3..5c782e6 100644
--- a/cc/render_pass_unittest.cc
+++ b/cc/render_pass_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "cc/render_pass.h"
 
-#include "CCCheckerboardDrawQuad.h"
+#include "cc/checkerboard_draw_quad.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/render_pass_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc
index a455a98..54ff6b1 100644
--- a/cc/render_surface_impl.cc
+++ b/cc/render_surface_impl.cc
@@ -6,11 +6,11 @@
 
 #include "cc/render_surface_impl.h"
 
-#include "CCDamageTracker.h"
-#include "CCDebugBorderDrawQuad.h"
-#include "CCDelegatedRendererLayerImpl.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
+#include "cc/damage_tracker.h"
+#include "cc/debug_border_draw_quad.h"
+#include "cc/delegated_renderer_layer_impl.h"
 #include "cc/layer_impl.h"
 #include "cc/math_util.h"
 #include "cc/quad_sink.h"
diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc
index 7aa635e..397cfc6 100644
--- a/cc/render_surface_unittest.cc
+++ b/cc/render_surface_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "cc/render_surface_impl.h"
 
-#include "CCAppendQuadsData.h"
+#include "cc/append_quads_data.h"
 #include "cc/layer_impl.h"
 #include "cc/render_pass_sink.h"
 #include "cc/scoped_ptr_vector.h"
diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc
index 30bd016..493991b 100644
--- a/cc/resource_provider_unittest.cc
+++ b/cc/resource_provider_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "cc/resource_provider.h"
 
-#include "CCGraphicsContext.h"
 #include "base/logging.h"
+#include "cc/graphics_context.h"
 #include "cc/scoped_ptr_deque.h"
 #include "cc/scoped_ptr_hash_map.h"
 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
diff --git a/cc/scheduler.h b/cc/scheduler.h
index 331739e..dbfa6c6 100644
--- a/cc/scheduler.h
+++ b/cc/scheduler.h
@@ -5,10 +5,10 @@
 #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/frame_rate_controller.h"
 #include "cc/scheduler_state_machine.h"
 
 namespace cc {
diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc
index 30d88ba..9667e75 100644
--- a/cc/single_thread_proxy.cc
+++ b/cc/single_thread_proxy.cc
@@ -6,9 +6,9 @@
 
 #include "cc/single_thread_proxy.h"
 
-#include "CCDrawQuad.h"
-#include "CCGraphicsContext.h"
 #include "base/debug/trace_event.h"
+#include "cc/draw_quad.h"
+#include "cc/graphics_context.h"
 #include "cc/layer_tree_host.h"
 #include "cc/texture_update_controller.h"
 #include "cc/timer.h"
diff --git a/cc/single_thread_proxy.h b/cc/single_thread_proxy.h
index 0d005b0..5b5e208 100644
--- a/cc/single_thread_proxy.h
+++ b/cc/single_thread_proxy.h
@@ -7,8 +7,8 @@
 
 #include <limits>
 
-#include "CCAnimationEvents.h"
 #include "base/time.h"
+#include "cc/animation_events.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/proxy.h"
 
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 05b7a11..7781b55 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -6,7 +6,7 @@
 
 #include "cc/software_renderer.h"
 
-#include "CCDebugBorderDrawQuad.h"
+#include "cc/debug_border_draw_quad.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/texture_draw_quad.h"
diff --git a/cc/software_renderer.h b/cc/software_renderer.h
index a3a35d8f..92961ca 100644
--- a/cc/software_renderer.h
+++ b/cc/software_renderer.h
@@ -6,7 +6,7 @@
 #define CCRendererSoftware_h
 
 #include "base/basictypes.h"
-#include "CCDirectRenderer.h"
+#include "cc/direct_renderer.h"
 #include <public/WebCompositorSoftwareOutputDevice.h>
 
 namespace cc {
diff --git a/cc/solid_color_draw_quad.h b/cc/solid_color_draw_quad.h
index 28efda5..43d2d67 100644
--- a/cc/solid_color_draw_quad.h
+++ b/cc/solid_color_draw_quad.h
@@ -5,9 +5,9 @@
 #ifndef CCSolidColorDrawQuad_h
 #define CCSolidColorDrawQuad_h
 
-#include "CCDrawQuad.h"
-#include "third_party/skia/include/core/SkColor.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {
 
diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc
index 381b0d2..c43ca5c 100644
--- a/cc/solid_color_layer_impl_unittest.cc
+++ b/cc/solid_color_layer_impl_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "cc/solid_color_layer_impl.h"
 
-#include "CCAppendQuadsData.h"
+#include "cc/append_quads_data.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/test/layer_test_common.h"
diff --git a/cc/stream_video_draw_quad.h b/cc/stream_video_draw_quad.h
index 06877ef..c258d01 100644
--- a/cc/stream_video_draw_quad.h
+++ b/cc/stream_video_draw_quad.h
@@ -5,8 +5,8 @@
 #ifndef CCStreamVideoDrawQuad_h
 #define CCStreamVideoDrawQuad_h
 
-#include "CCDrawQuad.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
 #include <public/WebTransformationMatrix.h>
 
 namespace cc {
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h
index c5a83697..1091582 100644
--- a/cc/test/animation_test_common.h
+++ b/cc/test/animation_test_common.h
@@ -5,9 +5,9 @@
 #ifndef CCAnimationTestCommon_h
 #define CCAnimationTestCommon_h
 
-#include "CCActiveAnimation.h"
-#include "CCAnimationCurve.h"
 #include "IntSize.h"
+#include "cc/active_animation.h"
+#include "cc/animation_curve.h"
 #include "cc/layer_animation_controller.h"
 
 namespace cc {
diff --git a/cc/test/fake_graphics_context.h b/cc/test/fake_graphics_context.h
index aaeb964..7fdb38a 100644
--- a/cc/test/fake_graphics_context.h
+++ b/cc/test/fake_graphics_context.h
@@ -5,7 +5,7 @@
 #ifndef FakeCCGraphicsContext_h
 #define FakeCCGraphicsContext_h
 
-#include "CCGraphicsContext.h"
+#include "cc/graphics_context.h"
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include <public/WebCompositorOutputSurface.h>
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index d264d79..1a41eec 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -6,7 +6,7 @@
 
 #include "cc/test/layer_test_common.h"
 
-#include "CCDrawQuad.h"
+#include "cc/draw_quad.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace LayerTestCommon {
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index 69e9947..686cd27 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -4,10 +4,10 @@
 
 #include "config.h"
 
-#include "CCThreadedTest.h"
+#include "cc/test/layer_tree_test_common.h"
 
-#include "CCActiveAnimation.h"
 #include "base/stl_util.h"
+#include "cc/active_animation.h"
 #include "cc/content_layer.h"
 #include "cc/input_handler.h"
 #include "cc/layer.h"
diff --git a/cc/test/mock_quad_culler.h b/cc/test/mock_quad_culler.h
index 06b7687..dc84c6d 100644
--- a/cc/test/mock_quad_culler.h
+++ b/cc/test/mock_quad_culler.h
@@ -5,9 +5,9 @@
 #ifndef MockCCQuadCuller_h
 #define MockCCQuadCuller_h
 
-#include "CCDrawQuad.h"
 #include "IntRect.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass.h"
 
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 9a16c35..a586150 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -5,9 +5,9 @@
 #ifndef CCSchedulerTestCommon_h
 #define CCSchedulerTestCommon_h
 
-#include "CCDelayBasedTimeSource.h"
-#include "CCFrameRateController.h"
 #include "base/threading/platform_thread.h"
+#include "cc/delay_based_time_source.h"
+#include "cc/frame_rate_controller.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 ee6d31d..6f27a67 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -5,7 +5,6 @@
 #ifndef CCTiledLayerTestCommon_h
 #define CCTiledLayerTestCommon_h
 
-#include "CCGraphicsContext.h"
 #include "IntRect.h"
 #include "IntSize.h"
 #include "Region.h"
diff --git a/cc/texture_draw_quad.h b/cc/texture_draw_quad.h
index 83b3531..ea406a2 100644
--- a/cc/texture_draw_quad.h
+++ b/cc/texture_draw_quad.h
@@ -5,8 +5,8 @@
 #ifndef CCTextureDrawQuad_h
 #define CCTextureDrawQuad_h
 
-#include "CCDrawQuad.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
 #include "ui/gfx/rect_f.h"
 
 namespace cc {
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
index ee08f77..0dc96ab 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -6,11 +6,11 @@
 
 #include "cc/thread_proxy.h"
 
-#include "CCDelayBasedTimeSource.h"
-#include "CCDrawQuad.h"
-#include "CCFrameRateController.h"
-#include "CCGraphicsContext.h"
 #include "base/debug/trace_event.h"
+#include "cc/delay_based_time_source.h"
+#include "cc/draw_quad.h"
+#include "cc/frame_rate_controller.h"
+#include "cc/graphics_context.h"
 #include "cc/input_handler.h"
 #include "cc/layer_tree_host.h"
 #include "cc/scheduler.h"
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
index 086855b..aab144a 100644
--- a/cc/thread_proxy.h
+++ b/cc/thread_proxy.h
@@ -5,9 +5,9 @@
 #ifndef CCThreadProxy_h
 #define CCThreadProxy_h
 
-#include "CCAnimationEvents.h"
-#include "CCCompletionEvent.h"
 #include "base/time.h"
+#include "cc/animation_events.h"
+#include "cc/completion_event.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/proxy.h"
 #include "cc/scheduler.h"
diff --git a/cc/tile_draw_quad.h b/cc/tile_draw_quad.h
index 768ef18..da02ea6 100644
--- a/cc/tile_draw_quad.h
+++ b/cc/tile_draw_quad.h
@@ -5,9 +5,9 @@
 #ifndef CCTileDrawQuad_h
 #define CCTileDrawQuad_h
 
-#include "CCDrawQuad.h"
-#include "third_party/khronos/GLES2/gl2.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
+#include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
index 715072a..b7a12af 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/tiled_layer_impl.cc
@@ -6,12 +6,12 @@
 
 #include "cc/tiled_layer_impl.h"
 
-#include "CCAppendQuadsData.h"
-#include "CCCheckerboardDrawQuad.h"
-#include "CCDebugBorderDrawQuad.h"
 #include "FloatQuad.h"
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
+#include "cc/append_quads_data.h"
+#include "cc/checkerboard_draw_quad.h"
+#include "cc/debug_border_draw_quad.h"
 #include "cc/layer_tiling_data.h"
 #include "cc/math_util.h"
 #include "cc/quad_sink.h"
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc
index 1c6fd8b..e8c066f 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/tiled_layer_impl_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "cc/tiled_layer_impl.h"
 
-#include "CCAppendQuadsData.h"
+#include "cc/append_quads_data.h"
 #include "cc/layer_tiling_data.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/layer_test_common.h"
diff --git a/cc/timing_function.h b/cc/timing_function.h
index 3d99539..67fe512 100644
--- a/cc/timing_function.h
+++ b/cc/timing_function.h
@@ -5,8 +5,8 @@
 #ifndef CCTimingFunction_h
 #define CCTimingFunction_h
 
-#include "CCAnimationCurve.h"
 #include "UnitBezier.h"
+#include "cc/animation_curve.h"
 
 namespace cc {
 
diff --git a/cc/yuv_video_draw_quad.h b/cc/yuv_video_draw_quad.h
index 27a452d..b1caae1 100644
--- a/cc/yuv_video_draw_quad.h
+++ b/cc/yuv_video_draw_quad.h
@@ -5,9 +5,9 @@
 #ifndef CCYUVVideoDrawQuad_h
 #define CCYUVVideoDrawQuad_h
 
-#include "CCDrawQuad.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
 #include "cc/video_layer_impl.h"
 
 namespace cc {