cc: Remove the temporary header files that aren't prefixed with CC*

The list of files was generated with the following command line:
$ ls *.h cc/ | grep -v CC

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

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

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

109 files changed, 171 insertions, 406 deletions

diff --git a/cc/BitmapCanvasLayerTextureUpdater.h b/cc/BitmapCanvasLayerTextureUpdater.h
deleted file mode 100644
index bf8f6fe..0000000
--- a/cc/BitmapCanvasLayerTextureUpdater.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/bitmap_canvas_layer_texture_updater.h"
diff --git a/cc/BitmapSkPictureCanvasLayerTextureUpdater.h b/cc/BitmapSkPictureCanvasLayerTextureUpdater.h
deleted file mode 100644
index 2e6dc44..0000000
--- a/cc/BitmapSkPictureCanvasLayerTextureUpdater.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/bitmap_skpicture_canvas_layer_texture_updater.h"
diff --git a/cc/CanvasLayerTextureUpdater.h b/cc/CanvasLayerTextureUpdater.h
deleted file mode 100644
index cb14510..0000000
--- a/cc/CanvasLayerTextureUpdater.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/canvas_layer_texture_updater.h"
diff --git a/cc/ContentLayerChromium.h b/cc/ContentLayerChromium.h
deleted file mode 100644
index 687dbd4..0000000
--- a/cc/ContentLayerChromium.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/content_layer.h"
diff --git a/cc/ContentLayerChromiumClient.h b/cc/ContentLayerChromiumClient.h
deleted file mode 100644
index 2bfb52a..0000000
--- a/cc/ContentLayerChromiumClient.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/content_layer_client.h"
diff --git a/cc/DelegatedRendererLayerChromium.h b/cc/DelegatedRendererLayerChromium.h
deleted file mode 100644
index 1b7e4e2..0000000
--- a/cc/DelegatedRendererLayerChromium.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.h"
diff --git a/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.h b/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.h
deleted file mode 100644
index 78c4b33..0000000
--- a/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.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_buffer_skpicture_canvas_layer_texture_updater.h"
diff --git a/cc/GeometryBinding.h b/cc/GeometryBinding.h
deleted file mode 100644
index 9af39a8..0000000
--- a/cc/GeometryBinding.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/geometry_binding.h"
diff --git a/cc/HeadsUpDisplayLayerChromium.h b/cc/HeadsUpDisplayLayerChromium.h
deleted file mode 100644
index 3d7a138..0000000
--- a/cc/HeadsUpDisplayLayerChromium.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/heads_up_display_layer.h"
diff --git a/cc/IOSurfaceLayerChromium.h b/cc/IOSurfaceLayerChromium.h
deleted file mode 100644
index 085ec98..0000000
--- a/cc/IOSurfaceLayerChromium.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/io_surface_layer.h"
diff --git a/cc/ImageLayerChromium.h b/cc/ImageLayerChromium.h
deleted file mode 100644
index 7b7e0c7..0000000
--- a/cc/ImageLayerChromium.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/image_layer.h"
diff --git a/cc/LayerChromium.h b/cc/LayerChromium.h
deleted file mode 100644
index ea56428..0000000
--- a/cc/LayerChromium.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.h"
diff --git a/cc/LayerPainterChromium.h b/cc/LayerPainterChromium.h
deleted file mode 100644
index 67987d9..0000000
--- a/cc/LayerPainterChromium.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_painter.h"
diff --git a/cc/LayerTextureSubImage.h b/cc/LayerTextureSubImage.h
deleted file mode 100644
index 3efbf6a..0000000
--- a/cc/LayerTextureSubImage.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_texture_sub_image.h"
diff --git a/cc/LayerTextureUpdater.h b/cc/LayerTextureUpdater.h
deleted file mode 100644
index 74bd00e..0000000
--- a/cc/LayerTextureUpdater.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_texture_updater.h"
diff --git a/cc/PlatformColor.h b/cc/PlatformColor.h
deleted file mode 100644
index 24690aa..0000000
--- a/cc/PlatformColor.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/platform_color.h"
diff --git a/cc/ProgramBinding.h b/cc/ProgramBinding.h
deleted file mode 100644
index f44ed18..0000000
--- a/cc/ProgramBinding.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/program_binding.h"
diff --git a/cc/RateLimiter.h b/cc/RateLimiter.h
deleted file mode 100644
index 90c7f54..0000000
--- a/cc/RateLimiter.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/rate_limiter.h"
diff --git a/cc/RenderSurfaceChromium.h b/cc/RenderSurfaceChromium.h
deleted file mode 100644
index a7a9147..0000000
--- a/cc/RenderSurfaceChromium.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/render_surface.h"
diff --git a/cc/ScrollbarLayerChromium.h b/cc/ScrollbarLayerChromium.h
deleted file mode 100644
index 1e7384a..0000000
--- a/cc/ScrollbarLayerChromium.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/scrollbar_layer.h"
diff --git a/cc/ShaderChromium.h b/cc/ShaderChromium.h
deleted file mode 100644
index 5170597..0000000
--- a/cc/ShaderChromium.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/shader.h"
diff --git a/cc/SkPictureCanvasLayerTextureUpdater.h b/cc/SkPictureCanvasLayerTextureUpdater.h
deleted file mode 100644
index 8d3d49e..0000000
--- a/cc/SkPictureCanvasLayerTextureUpdater.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/skpicture_canvas_layer_texture_updater.h"
diff --git a/cc/SolidColorLayerChromium.h b/cc/SolidColorLayerChromium.h
deleted file mode 100644
index a60d376..0000000
--- a/cc/SolidColorLayerChromium.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/solid_color_layer.h"
diff --git a/cc/TextureCopier.h b/cc/TextureCopier.h
deleted file mode 100644
index de210fe..0000000
--- a/cc/TextureCopier.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/texture_copier.h"
diff --git a/cc/TextureLayerChromium.h b/cc/TextureLayerChromium.h
deleted file mode 100644
index 620c2d5..0000000
--- a/cc/TextureLayerChromium.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/texture_layer.h"
diff --git a/cc/TextureLayerChromiumClient.h b/cc/TextureLayerChromiumClient.h
deleted file mode 100644
index bec4fa5..0000000
--- a/cc/TextureLayerChromiumClient.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/texture_layer_client.h"
diff --git a/cc/TextureUploader.h b/cc/TextureUploader.h
deleted file mode 100644
index 0cf73f7..0000000
--- a/cc/TextureUploader.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/texture_uploader.h"
diff --git a/cc/ThrottledTextureUploader.h b/cc/ThrottledTextureUploader.h
deleted file mode 100644
index f839d24..0000000
--- a/cc/ThrottledTextureUploader.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/throttled_texture_uploader.h"
diff --git a/cc/TiledLayerChromium.h b/cc/TiledLayerChromium.h
deleted file mode 100644
index cdf7868..0000000
--- a/cc/TiledLayerChromium.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.h"
diff --git a/cc/TreeSynchronizer.h b/cc/TreeSynchronizer.h
deleted file mode 100644
index f6e56c1..0000000
--- a/cc/TreeSynchronizer.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/tree_synchronizer.h"
diff --git a/cc/UnthrottledTextureUploader.h b/cc/UnthrottledTextureUploader.h
deleted file mode 100644
index 6df0878..0000000
--- a/cc/UnthrottledTextureUploader.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/unthrottled_texture_uploader.h"
diff --git a/cc/VideoLayerChromium.h b/cc/VideoLayerChromium.h
deleted file mode 100644
index 2d2179e..0000000
--- a/cc/VideoLayerChromium.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.h"
diff --git a/cc/bitmap_canvas_layer_texture_updater.cc b/cc/bitmap_canvas_layer_texture_updater.cc
index 73aa24e..d533a22 100644
--- a/cc/bitmap_canvas_layer_texture_updater.cc
+++ b/cc/bitmap_canvas_layer_texture_updater.cc
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #include "config.h"
 
-#include "BitmapCanvasLayerTextureUpdater.h"
+#include "cc/bitmap_canvas_layer_texture_updater.h"
 
 #include "CCTextureUpdateQueue.h"
-#include "LayerPainterChromium.h"
-#include "PlatformColor.h"
+#include "cc/layer_painter.h"
+#include "cc/platform_color.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace cc {
diff --git a/cc/bitmap_canvas_layer_texture_updater.h b/cc/bitmap_canvas_layer_texture_updater.h
index 088bca2..9b40b5a 100644
--- a/cc/bitmap_canvas_layer_texture_updater.h
+++ b/cc/bitmap_canvas_layer_texture_updater.h
@@ -6,7 +6,7 @@
 #ifndef BitmapCanvasLayerTextureUpdater_h
 #define BitmapCanvasLayerTextureUpdater_h
 
-#include "CanvasLayerTextureUpdater.h"
+#include "cc/canvas_layer_texture_updater.h"
 
 class SkCanvas;
 
diff --git a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
index f1dff63..b9edeed 100644
--- a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
+++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #include "config.h"
 
-#include "BitmapSkPictureCanvasLayerTextureUpdater.h"
+#include "cc/bitmap_skpicture_canvas_layer_texture_updater.h"
 
 #include "CCRenderingStats.h"
 #include "CCTextureUpdateQueue.h"
-#include "LayerPainterChromium.h"
-#include "PlatformColor.h"
+#include "cc/layer_painter.h"
+#include "cc/platform_color.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include <wtf/CurrentTime.h>
diff --git a/cc/bitmap_skpicture_canvas_layer_texture_updater.h b/cc/bitmap_skpicture_canvas_layer_texture_updater.h
index 4115c5b..260557d 100644
--- a/cc/bitmap_skpicture_canvas_layer_texture_updater.h
+++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #ifndef BitmapSkPictureCanvasLayerTextureUpdater_h
 #define BitmapSkPictureCanvasLayerTextureUpdater_h
 
+#include "cc/skpicture_canvas_layer_texture_updater.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "SkPictureCanvasLayerTextureUpdater.h"
 
 namespace cc {
 
diff --git a/cc/caching_bitmap_canvas_layer_texture_updater.cc b/cc/caching_bitmap_canvas_layer_texture_updater.cc
index 59e61df..a8a8483 100644
--- a/cc/caching_bitmap_canvas_layer_texture_updater.cc
+++ b/cc/caching_bitmap_canvas_layer_texture_updater.cc
@@ -6,7 +6,7 @@
 
 #include "caching_bitmap_canvas_layer_texture_updater.h"
 
-#include "LayerPainterChromium.h"
+#include "cc/layer_painter.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace cc {
diff --git a/cc/caching_bitmap_canvas_layer_texture_updater.h b/cc/caching_bitmap_canvas_layer_texture_updater.h
index 036aaed..a7fbfec 100644
--- a/cc/caching_bitmap_canvas_layer_texture_updater.h
+++ b/cc/caching_bitmap_canvas_layer_texture_updater.h
@@ -6,7 +6,7 @@
 #define CACHING_BITMAP_CANVAS_LAYER_TEXTURE_UPDATER_H_
 
 #include "base/compiler_specific.h"
-#include "BitmapCanvasLayerTextureUpdater.h"
+#include "cc/bitmap_canvas_layer_texture_updater.h"
 
 namespace cc {
 
diff --git a/cc/canvas_layer_texture_updater.cc b/cc/canvas_layer_texture_updater.cc
index 0f2f3a0..846575e 100644
--- a/cc/canvas_layer_texture_updater.cc
+++ b/cc/canvas_layer_texture_updater.cc
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #include "config.h"
 
-#include "CanvasLayerTextureUpdater.h"
+#include "cc/canvas_layer_texture_updater.h"
 
 #include "CCRenderingStats.h"
 #include "FloatRect.h"
-#include "LayerPainterChromium.h"
 #include "SkiaUtils.h"
 #include "TraceEvent.h"
+#include "cc/layer_painter.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
diff --git a/cc/canvas_layer_texture_updater.h b/cc/canvas_layer_texture_updater.h
index f1b5d8f..bf67176 100644
--- a/cc/canvas_layer_texture_updater.h
+++ b/cc/canvas_layer_texture_updater.h
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #ifndef CanvasLayerTextureUpdater_h
 #define CanvasLayerTextureUpdater_h
 
-#include "LayerTextureUpdater.h"
+#include "cc/layer_texture_updater.h"
 
 class SkCanvas;
 
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 399d83d..45d7ed6 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -9,9 +9,9 @@
       'scoped_ptr_hash_map.h',
       'scoped_ptr_vector.h',
       'bitmap_canvas_layer_texture_updater.cc',
-      'BitmapCanvasLayerTextureUpdater.h',
+      'bitmap_canvas_layer_texture_updater.h',
       'bitmap_skpicture_canvas_layer_texture_updater.cc',
-      'BitmapSkPictureCanvasLayerTextureUpdater.h',
+      'bitmap_skpicture_canvas_layer_texture_updater.h',
       'caching_bitmap_canvas_layer_texture_updater.cc',
       'caching_bitmap_canvas_layer_texture_updater.h',
       'active_animation.cc',
@@ -167,66 +167,63 @@
       'yuv_video_draw_quad.cc',
       'CCYUVVideoDrawQuad.h',
       'canvas_layer_texture_updater.cc',
-      'CanvasLayerTextureUpdater.h',
+      'canvas_layer_texture_updater.h',
       'content_layer.cc',
-      'ContentLayerChromium.h',
-      'ContentLayerChromiumClient.h',
+      'content_layer.h',
+      'content_layer_client.h',
       'delegated_renderer_layer.cc',
-      'DelegatedRendererLayerChromium.h',
+      'delegated_renderer_layer.h',
       'frame_buffer_skpicture_canvas_layer_texture_updater.cc',
-      'FrameBufferSkPictureCanvasLayerTextureUpdater.h',
+      'frame_buffer_skpicture_canvas_layer_texture_updater.h',
       'geometry_binding.cc',
-      'GeometryBinding.h',
+      'geometry_binding.h',
       'heads_up_display_layer.cc',
-      'HeadsUpDisplayLayerChromium.h',
+      'heads_up_display_layer.h',
       'io_surface_layer.cc',
-      'IOSurfaceLayerChromium.h',
+      'io_surface_layer.h',
       'image_layer.cc',
-      'ImageLayerChromium.h',
+      'image_layer.h',
       'layer.cc',
-      'LayerChromium.h',
-      'LayerPainterChromium.h',
+      'layer.h',
+      'layer_painter.h',
       'layer_texture_sub_image.cc',
-      'LayerTextureSubImage.h',
+      'layer_texture_sub_image.h',
       'layer_texture_updater.cc',
-      'LayerTextureUpdater.h',
-      'PlatformColor.h',
+      'layer_texture_updater.h',
+      'platform_color.h',
       'program_binding.cc',
-      'ProgramBinding.h',
+      'program_binding.h',
       'rate_limiter.cc',
-      'RateLimiter.h',
+      'rate_limiter.h',
       'render_surface.cc',
-      'RenderSurfaceChromium.h',
+      'render_surface.h',
       'scrollbar_layer.cc',
-      'ScrollbarLayerChromium.h',
+      'scrollbar_layer.h',
       'shader.cc',
-      'ShaderChromium.h',
+      'shader.h',
       'skpicture_canvas_layer_texture_updater.cc',
-      'SkPictureCanvasLayerTextureUpdater.h',
+      'skpicture_canvas_layer_texture_updater.h',
       'solid_color_layer.cc',
-      'SolidColorLayerChromium.h',
+      'solid_color_layer.h',
       'switches.cc',
       'switches.h',
       'texture_copier.cc',
-      'TextureCopier.h',
+      'texture_copier.h',
       'texture_layer.cc',
-      'TextureLayerChromium.h',
-      'TextureLayerChromiumClient.h',
-      'TextureUploader.h',
+      'texture_layer.h',
+      'texture_layer_client.h',
+      'texture_uploader.h',
       'throttled_texture_uploader.cc',
-      'ThrottledTextureUploader.h',
+      'throttled_texture_uploader.h',
       'unthrottled_texture_uploader.cc',
-      'UnthrottledTextureUploader.h',
+      'unthrottled_texture_uploader.h',
       'tiled_layer.cc',
-      'TiledLayerChromium.h',
+      'tiled_layer.h',
       'tree_synchronizer.cc',
-      'TreeSynchronizer.h',
+      'tree_synchronizer.h',
       'video_layer.cc',
-      'VideoLayerChromium.h',
+      'video_layer.h',
 
-      'bitmap_canvas_layer_texture_updater.h',
-      'bitmap_skpicture_canvas_layer_texture_updater.h',
-      'canvas_layer_texture_updater.h',
       'active_animation.h',
       'animation_curve.h',
       'animation_events.h',
@@ -310,35 +307,6 @@
       'timing_function.h',
       'video_layer_impl.h',
       'yuv_video_draw_quad.h',
-      'content_layer_client.h',
-      'content_layer.h',
-      'delegated_renderer_layer.h',
-      'frame_buffer_skpicture_canvas_layer_texture_updater.h',
-      'geometry_binding.h',
-      'heads_up_display_layer.h',
-      'image_layer.h',
-      'io_surface_layer.h',
-      'layer.h',
-      'layer_painter.h',
-      'layer_texture_sub_image.h',
-      'layer_texture_updater.h',
-      'platform_color.h',
-      'program_binding.h',
-      'rate_limiter.h',
-      'render_surface.h',
-      'scrollbar_layer.h',
-      'shader.h',
-      'skpicture_canvas_layer_texture_updater.h',
-      'solid_color_layer.h',
-      'texture_copier.h',
-      'texture_layer_client.h',
-      'texture_layer.h',
-      'texture_uploader.h',
-      'throttled_texture_uploader.h',
-      'tiled_layer.h',
-      'tree_synchronizer.h',
-      'unthrottled_texture_uploader.h',
-      'video_layer.h',
     ],
   },
   'targets': [
diff --git a/cc/content_layer.cc b/cc/content_layer.cc
index 5c915f9..750ec7c 100644
--- a/cc/content_layer.cc
+++ b/cc/content_layer.cc
@@ -4,16 +4,16 @@
 
 #include "config.h"
 
-#include "ContentLayerChromium.h"
+#include "cc/content_layer.h"
 
-#include "base/time.h"
-#include "BitmapCanvasLayerTextureUpdater.h"
-#include "BitmapSkPictureCanvasLayerTextureUpdater.h"
 #include "CCLayerTreeHost.h"
 #include "CCSettings.h"
-#include "ContentLayerChromiumClient.h"
-#include "FrameBufferSkPictureCanvasLayerTextureUpdater.h"
-#include "LayerPainterChromium.h"
+#include "base/time.h"
+#include "cc/bitmap_canvas_layer_texture_updater.h"
+#include "cc/bitmap_skpicture_canvas_layer_texture_updater.h"
+#include "cc/content_layer_client.h"
+#include "cc/frame_buffer_skpicture_canvas_layer_texture_updater.h"
+#include "cc/layer_painter.h"
 #include <public/Platform.h>
 
 namespace cc {
diff --git a/cc/content_layer.h b/cc/content_layer.h
index fdeb50b..991ff65 100644
--- a/cc/content_layer.h
+++ b/cc/content_layer.h
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #ifndef ContentLayerChromium_h
 #define ContentLayerChromium_h
 
 #include "base/basictypes.h"
-#include "LayerPainterChromium.h"
-#include "TiledLayerChromium.h"
+#include "cc/layer_painter.h"
+#include "cc/tiled_layer.h"
 
 class SkCanvas;
 
diff --git a/cc/content_layer_unittest.cc b/cc/content_layer_unittest.cc
index 2f35cd9..37d66be 100644
--- a/cc/content_layer_unittest.cc
+++ b/cc/content_layer_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "config.h"
 
-#include "ContentLayerChromium.h"
+#include "cc/content_layer.h"
 
-#include "BitmapCanvasLayerTextureUpdater.h"
 #include "CCRenderingStats.h"
-#include "ContentLayerChromiumClient.h"
+#include "cc/bitmap_canvas_layer_texture_updater.h"
+#include "cc/content_layer_client.h"
 #include "cc/test/geometry_test_utils.h"
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/delegated_renderer_layer.cc b/cc/delegated_renderer_layer.cc
index 721630d..4323878 100644
--- a/cc/delegated_renderer_layer.cc
+++ b/cc/delegated_renderer_layer.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "config.h"
-#include "DelegatedRendererLayerChromium.h"
+#include "cc/delegated_renderer_layer.h"
 
 #include "CCDelegatedRendererLayerImpl.h"
 
diff --git a/cc/delegated_renderer_layer.h b/cc/delegated_renderer_layer.h
index c7f8d2c..0dbb01a 100644
--- a/cc/delegated_renderer_layer.h
+++ b/cc/delegated_renderer_layer.h
@@ -5,7 +5,7 @@
 #ifndef DelegatedRendererLayerChromium_h
 #define DelegatedRendererLayerChromium_h
 
-#include "LayerChromium.h"
+#include "cc/layer.h"
 
 namespace cc {
 
diff --git a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc
index a7daef0..284fa5e 100644
--- a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc
+++ b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #include "config.h"
 
-#include "FrameBufferSkPictureCanvasLayerTextureUpdater.h"
+#include "cc/frame_buffer_skpicture_canvas_layer_texture_updater.h"
 
-#include "LayerPainterChromium.h"
+#include "cc/layer_painter.h"
 
 namespace cc {
 
diff --git a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h
index de4a0aa..25981a5 100644
--- a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h
+++ b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h
@@ -6,7 +6,7 @@
 #ifndef FrameBufferSkPictureCanvasLayerTextureUpdater_h
 #define FrameBufferSkPictureCanvasLayerTextureUpdater_h
 
-#include "SkPictureCanvasLayerTextureUpdater.h"
+#include "cc/skpicture_canvas_layer_texture_updater.h"
 
 namespace cc {
 
diff --git a/cc/geometry_binding.cc b/cc/geometry_binding.cc
index 8656a48..f1ab929 100644
--- a/cc/geometry_binding.cc
+++ b/cc/geometry_binding.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "GeometryBinding.h"
+#include "cc/geometry_binding.h"
 
 #include "CCRendererGL.h" // For the GLC() macro.
 #include "GraphicsContext3D.h"
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index f573607..f76863e 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -18,16 +18,16 @@
 #include "CCVideoLayerImpl.h"
 #include "Extensions3D.h"
 #include "FloatQuad.h"
-#include "GeometryBinding.h"
 #include "GrTexture.h"
 #include "NotImplemented.h"
-#include "PlatformColor.h"
 #include "TraceEvent.h"
 #ifdef LOG
 #undef LOG
 #endif
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "cc/geometry_binding.h"
+#include "cc/platform_color.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include <public/WebGraphicsContext3D.h>
diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc
index 743593c..0396fa5 100644
--- a/cc/heads_up_display_layer.cc
+++ b/cc/heads_up_display_layer.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "HeadsUpDisplayLayerChromium.h"
+#include "cc/heads_up_display_layer.h"
 
 #include "CCHeadsUpDisplayLayerImpl.h"
 #include "CCLayerTreeHost.h"
diff --git a/cc/heads_up_display_layer.h b/cc/heads_up_display_layer.h
index cd2627e..9d087c0e 100644
--- a/cc/heads_up_display_layer.h
+++ b/cc/heads_up_display_layer.h
@@ -5,10 +5,10 @@
 #ifndef HeadsUpDisplayLayerChromium_h
 #define HeadsUpDisplayLayerChromium_h
 
-#include "base/memory/scoped_ptr.h"
 #include "CCFontAtlas.h"
 #include "IntSize.h"
-#include "LayerChromium.h"
+#include "base/memory/scoped_ptr.h"
+#include "cc/layer.h"
 
 namespace cc {
 
diff --git a/cc/heads_up_display_unittest.cc b/cc/heads_up_display_unittest.cc
index 5ad3796..2c55fcf 100644
--- a/cc/heads_up_display_unittest.cc
+++ b/cc/heads_up_display_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "CCLayerTreeHost.h"
 #include "CCThreadedTest.h"
-#include "HeadsUpDisplayLayerChromium.h"
-#include "LayerChromium.h"
+#include "cc/heads_up_display_layer.h"
+#include "cc/layer.h"
 
 using namespace cc;
 using namespace WebKitTests;
diff --git a/cc/image_layer.cc b/cc/image_layer.cc
index c9260a3..d7bb2a6 100644
--- a/cc/image_layer.cc
+++ b/cc/image_layer.cc
@@ -4,13 +4,13 @@
 
 #include "config.h"
 
-#include "ImageLayerChromium.h"
+#include "cc/image_layer.h"
 
-#include "base/compiler_specific.h"
 #include "CCLayerTreeHost.h"
 #include "CCTextureUpdateQueue.h"
-#include "LayerTextureUpdater.h"
-#include "PlatformColor.h"
+#include "base/compiler_specific.h"
+#include "cc/layer_texture_updater.h"
+#include "cc/platform_color.h"
 
 namespace cc {
 
diff --git a/cc/image_layer.h b/cc/image_layer.h
index b304fe6..404aed4 100644
--- a/cc/image_layer.h
+++ b/cc/image_layer.h
@@ -5,7 +5,7 @@
 #ifndef ImageLayerChromium_h
 #define ImageLayerChromium_h
 
-#include "ContentLayerChromium.h"
+#include "cc/content_layer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace cc {
diff --git a/cc/io_surface_layer.cc b/cc/io_surface_layer.cc
index db1f1a7..df125d1 100644
--- a/cc/io_surface_layer.cc
+++ b/cc/io_surface_layer.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "IOSurfaceLayerChromium.h"
+#include "cc/io_surface_layer.h"
 
 #include "CCIOSurfaceLayerImpl.h"
 
diff --git a/cc/io_surface_layer.h b/cc/io_surface_layer.h
index 7eb44fe..afea279 100644
--- a/cc/io_surface_layer.h
+++ b/cc/io_surface_layer.h
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #ifndef IOSurfaceLayerChromium_h
 #define IOSurfaceLayerChromium_h
 
-#include "LayerChromium.h"
+#include "cc/layer.h"
 
 namespace cc {
 
diff --git a/cc/layer.cc b/cc/layer.cc
index 7c4adf9..a7b74c8 100644
--- a/cc/layer.cc
+++ b/cc/layer.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "LayerChromium.h"
+#include "cc/layer.h"
 
 #include "CCActiveAnimation.h"
 #include "CCAnimationEvents.h"
diff --git a/cc/layer.h b/cc/layer.h
index f16fbe7..0dd140f 100644
--- a/cc/layer.h
+++ b/cc/layer.h
@@ -5,12 +5,12 @@
 #ifndef LayerChromium_h
 #define LayerChromium_h
 
-#include "base/memory/ref_counted.h"
 #include "CCLayerAnimationController.h"
 #include "CCOcclusionTracker.h"
 #include "FloatPoint.h"
 #include "Region.h"
-#include "RenderSurfaceChromium.h"
+#include "base/memory/ref_counted.h"
+#include "cc/render_surface.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/layer_iterator.cc b/cc/layer_iterator.cc
index f9f1968..05af12b 100644
--- a/cc/layer_iterator.cc
+++ b/cc/layer_iterator.cc
@@ -8,8 +8,8 @@
 
 #include "CCLayerImpl.h"
 #include "CCRenderSurface.h"
-#include "LayerChromium.h"
-#include "RenderSurfaceChromium.h"
+#include "cc/layer.h"
+#include "cc/render_surface.h"
 
 namespace cc {
 
diff --git a/cc/layer_iterator_unittest.cc b/cc/layer_iterator_unittest.cc
index c364b96..ecb80ed 100644
--- a/cc/layer_iterator_unittest.cc
+++ b/cc/layer_iterator_unittest.cc
@@ -7,7 +7,7 @@
 #include "CCLayerIterator.h"
 
 #include "CCLayerTreeHostCommon.h"
-#include "LayerChromium.h"
+#include "cc/layer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/layer_texture_sub_image.cc b/cc/layer_texture_sub_image.cc
index 219aa44..da27507 100644
--- a/cc/layer_texture_sub_image.cc
+++ b/cc/layer_texture_sub_image.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "LayerTextureSubImage.h"
+#include "cc/layer_texture_sub_image.h"
 
 #include "CCRendererGL.h" // For the GLC() macro.
 #include "GraphicsContext3D.h"
diff --git a/cc/layer_texture_updater.cc b/cc/layer_texture_updater.cc
index 7e8c11e..c97a986 100644
--- a/cc/layer_texture_updater.cc
+++ b/cc/layer_texture_updater.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "LayerTextureUpdater.h"
+#include "cc/layer_texture_updater.h"
 
 namespace cc {
 
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index a157136..8d4d63b 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -19,11 +19,11 @@
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
 #include "CCThreadProxy.h"
-#include "HeadsUpDisplayLayerChromium.h"
-#include "LayerChromium.h"
 #include "Region.h"
 #include "TraceEvent.h"
-#include "TreeSynchronizer.h"
+#include "cc/heads_up_display_layer.h"
+#include "cc/layer.h"
+#include "cc/tree_synchronizer.h"
 
 using namespace std;
 using WebKit::WebTransformationMatrix;
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index 7cb63f8..6d8c9979 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -18,7 +18,7 @@
 #include "CCProxy.h"
 #include "CCRenderingStats.h"
 #include "IntRect.h"
-#include "RateLimiter.h"
+#include "cc/rate_limiter.h"
 #include "scoped_ptr_vector.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include <limits>
diff --git a/cc/layer_tree_host_common.cc b/cc/layer_tree_host_common.cc
index 24274a6f..1044930 100644
--- a/cc/layer_tree_host_common.cc
+++ b/cc/layer_tree_host_common.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #include "config.h"
 
 #include "CCLayerTreeHostCommon.h"
@@ -14,8 +13,8 @@
 #include "CCRenderSurface.h"
 #include "FloatQuad.h"
 #include "IntRect.h"
-#include "LayerChromium.h"
-#include "RenderSurfaceChromium.h"
+#include "cc/layer.h"
+#include "cc/render_surface.h"
 #include <public/WebTransformationMatrix.h>
 
 using WebKit::WebTransformationMatrix;
diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc
index a2c9792..7db514f 100644
--- a/cc/layer_tree_host_common_unittest.cc
+++ b/cc/layer_tree_host_common_unittest.cc
@@ -13,9 +13,9 @@
 #include "CCProxy.h"
 #include "CCSingleThreadProxy.h"
 #include "CCThread.h"
-#include "ContentLayerChromium.h"
-#include "ContentLayerChromiumClient.h"
-#include "LayerChromium.h"
+#include "cc/content_layer.h"
+#include "cc/content_layer_client.h"
+#include "cc/layer.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index 7c23e0a..6b984a7 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -6,7 +6,6 @@
 
 #include "CCLayerTreeHostImpl.h"
 
-#include "base/basictypes.h"
 #include "CCAppendQuadsData.h"
 #include "CCDamageTracker.h"
 #include "CCDebugRectHistory.h"
@@ -29,8 +28,9 @@
 #include "CCScrollbarLayerImpl.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
-#include "TextureUploader.h"
 #include "TraceEvent.h"
+#include "base/basictypes.h"
+#include "cc/texture_uploader.h"
 #include <wtf/CurrentTime.h>
 #include <algorithm>
 
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index a79295a..dcce06c 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -13,10 +13,10 @@
 #include "CCTextureUpdateQueue.h"
 #include "CCThreadedTest.h"
 #include "CCTimingFunction.h"
-#include "ContentLayerChromium.h"
-#include "ContentLayerChromiumClient.h"
 #include "Extensions3DChromium.h"
 #include "base/synchronization/lock.h"
+#include "cc/content_layer.h"
+#include "cc/content_layer_client.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/occlusion_tracker_test_common.h"
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
index aa5d58c..d10d891 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layer_unittest.cc
@@ -4,13 +4,13 @@
 
 #include "config.h"
 
-#include "LayerChromium.h"
+#include "cc/layer.h"
 
 #include "CCKeyframedAnimationCurve.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
 #include "CCSingleThreadProxy.h"
-#include "LayerPainterChromium.h"
+#include "cc/layer_painter.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/web_compositor_initializer.h"
diff --git a/cc/occlusion_tracker.cc b/cc/occlusion_tracker.cc
index debc511..39d7efe 100644
--- a/cc/occlusion_tracker.cc
+++ b/cc/occlusion_tracker.cc
@@ -9,7 +9,7 @@
 #include "CCLayerImpl.h"
 #include "CCMathUtil.h"
 #include "CCOverdrawMetrics.h"
-#include "LayerChromium.h"
+#include "cc/layer.h"
 #include <algorithm>
 
 using namespace std;
diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc
index 7bd1b77..76306b8 100644
--- a/cc/occlusion_tracker_unittest.cc
+++ b/cc/occlusion_tracker_unittest.cc
@@ -12,8 +12,8 @@
 #include "CCMathUtil.h"
 #include "CCOverdrawMetrics.h"
 #include "CCSingleThreadProxy.h"
-#include "LayerChromium.h"
 #include "Region.h"
+#include "cc/layer.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/occlusion_tracker_test_common.h"
diff --git a/cc/program_binding.cc b/cc/program_binding.cc
index 4d88aa3..094020b 100644
--- a/cc/program_binding.cc
+++ b/cc/program_binding.cc
@@ -4,12 +4,12 @@
 
 #include "config.h"
 
-#include "ProgramBinding.h"
+#include "cc/program_binding.h"
 
 #include "CCRendererGL.h" // For the GLC() macro.
-#include "GeometryBinding.h"
 #include "GraphicsContext3D.h"
 #include "TraceEvent.h"
+#include "cc/geometry_binding.h"
 #include <public/WebGraphicsContext3D.h>
 
 using WebKit::WebGraphicsContext3D;
diff --git a/cc/rate_limiter.cc b/cc/rate_limiter.cc
index f4e8a55..b26959e 100644
--- a/cc/rate_limiter.cc
+++ b/cc/rate_limiter.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "RateLimiter.h"
+#include "cc/rate_limiter.h"
 
 #include "CCProxy.h"
 #include "CCThread.h"
diff --git a/cc/render_surface.cc b/cc/render_surface.cc
index f855d1a..769a622 100644
--- a/cc/render_surface.cc
+++ b/cc/render_surface.cc
@@ -4,10 +4,10 @@
 
 #include "config.h"
 
-#include "RenderSurfaceChromium.h"
+#include "cc/render_surface.h"
 
 #include "CCMathUtil.h"
-#include "LayerChromium.h"
+#include "cc/layer.h"
 #include <public/WebTransformationMatrix.h>
 
 using WebKit::WebTransformationMatrix;
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index 00ac892..4b2326b 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -11,18 +11,18 @@
 
 #include <limits.h>
 
+#include "CCProxy.h"
+#include "CCRendererGL.h" // For the GLC() macro.
+#include "Extensions3DChromium.h"
+#include "IntRect.h"
 #include "base/debug/alias.h"
 #include "base/hash_tables.h"
 #include "base/stl_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
-#include "CCProxy.h"
-#include "CCRendererGL.h" // For the GLC() macro.
-#include "Extensions3DChromium.h"
-#include "IntRect.h"
-#include "LayerTextureSubImage.h"
-#include "ThrottledTextureUploader.h"
-#include "UnthrottledTextureUploader.h"
+#include "cc/layer_texture_sub_image.h"
+#include "cc/throttled_texture_uploader.h"
+#include "cc/unthrottled_texture_uploader.h"
 #include <public/WebGraphicsContext3D.h>
 
 using WebKit::WebGraphicsContext3D;
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index b359528..d6eae23 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -5,14 +5,14 @@
 #ifndef CCResourceProvider_h
 #define CCResourceProvider_h
 
-#include "base/basictypes.h"
-#include "base/hash_tables.h"
 #include "CCGraphicsContext.h"
 #include "GraphicsContext3D.h"
 #include "IntSize.h"
+#include "base/basictypes.h"
+#include "base/hash_tables.h"
+#include "cc/texture_copier.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "TextureCopier.h"
 #include <wtf/Deque.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc
index e93900d..d75a79c 100644
--- a/cc/scrollbar_layer.cc
+++ b/cc/scrollbar_layer.cc
@@ -4,14 +4,14 @@
 
 #include "config.h"
 
-#include "ScrollbarLayerChromium.h"
+#include "cc/scrollbar_layer.h"
 
-#include "base/basictypes.h"
 #include "CCLayerTreeHost.h"
 #include "CCScrollbarLayerImpl.h"
 #include "CCTextureUpdateQueue.h"
-#include "LayerPainterChromium.h"
 #include "TraceEvent.h"
+#include "base/basictypes.h"
+#include "cc/layer_painter.h"
 #include <public/WebRect.h>
 
 using WebKit::WebRect;
diff --git a/cc/scrollbar_layer.h b/cc/scrollbar_layer.h
index 3d70f91..c3dd96e 100644
--- a/cc/scrollbar_layer.h
+++ b/cc/scrollbar_layer.h
@@ -6,8 +6,8 @@
 #ifndef ScrollbarLayerChromium_h
 #define ScrollbarLayerChromium_h
 
-#include "LayerChromium.h"
 #include "caching_bitmap_canvas_layer_texture_updater.h"
+#include "cc/layer.h"
 #include <public/WebScrollbar.h>
 #include <public/WebScrollbarThemeGeometry.h>
 #include <public/WebScrollbarThemePainter.h>
diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc
index 9586fdd..73a7fac 100644
--- a/cc/scrollbar_layer_unittest.cc
+++ b/cc/scrollbar_layer_unittest.cc
@@ -4,13 +4,13 @@
 
 #include "config.h"
 
-#include "ScrollbarLayerChromium.h"
+#include "cc/scrollbar_layer.h"
 
 #include "CCScrollbarAnimationController.h"
 #include "CCScrollbarLayerImpl.h"
 #include "CCSingleThreadProxy.h"
-#include "TreeSynchronizer.h"
 #include "cc/test/fake_web_scrollbar_theme_geometry.h"
+#include "cc/tree_synchronizer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebScrollbar.h>
 #include <public/WebScrollbarThemeGeometry.h>
diff --git a/cc/shader.cc b/cc/shader.cc
index d3c5d3f..b936dd9 100644
--- a/cc/shader.cc
+++ b/cc/shader.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "ShaderChromium.h"
+#include "cc/shader.h"
 
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/StdLibExtras.h>
diff --git a/cc/skpicture_canvas_layer_texture_updater.cc b/cc/skpicture_canvas_layer_texture_updater.cc
index 290c40b..36048f7 100644
--- a/cc/skpicture_canvas_layer_texture_updater.cc
+++ b/cc/skpicture_canvas_layer_texture_updater.cc
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #include "config.h"
 
-#include "SkPictureCanvasLayerTextureUpdater.h"
+#include "cc/skpicture_canvas_layer_texture_updater.h"
 
 #include "CCTextureUpdateQueue.h"
-#include "LayerPainterChromium.h"
 #include "TraceEvent.h"
+#include "cc/layer_painter.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace cc {
diff --git a/cc/skpicture_canvas_layer_texture_updater.h b/cc/skpicture_canvas_layer_texture_updater.h
index f63adec..af3818f 100644
--- a/cc/skpicture_canvas_layer_texture_updater.h
+++ b/cc/skpicture_canvas_layer_texture_updater.h
@@ -6,7 +6,7 @@
 #ifndef SkPictureCanvasLayerTextureUpdater_h
 #define SkPictureCanvasLayerTextureUpdater_h
 
-#include "CanvasLayerTextureUpdater.h"
+#include "cc/canvas_layer_texture_updater.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 class SkCanvas;
diff --git a/cc/solid_color_layer.cc b/cc/solid_color_layer.cc
index de1ed2d..b834ddc 100644
--- a/cc/solid_color_layer.cc
+++ b/cc/solid_color_layer.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "SolidColorLayerChromium.h"
+#include "cc/solid_color_layer.h"
 
 #include "CCSolidColorLayerImpl.h"
 
diff --git a/cc/solid_color_layer.h b/cc/solid_color_layer.h
index 99ca19d..bc1ede9 100644
--- a/cc/solid_color_layer.h
+++ b/cc/solid_color_layer.h
@@ -6,7 +6,7 @@
 #ifndef SolidColorLayerChromium_h
 #define SolidColorLayerChromium_h
 
-#include "LayerChromium.h"
+#include "cc/layer.h"
 
 namespace cc {
 
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index e7264ee..7ceaf3f 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -9,7 +9,7 @@
 #include "CCKeyframedAnimationCurve.h"
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
-#include "LayerChromium.h"
+#include "cc/layer.h"
 #include <public/WebTransformOperations.h>
 
 using namespace cc;
diff --git a/cc/test/occlusion_tracker_test_common.h b/cc/test/occlusion_tracker_test_common.h
index 14f2091..0bc9a4c 100644
--- a/cc/test/occlusion_tracker_test_common.h
+++ b/cc/test/occlusion_tracker_test_common.h
@@ -9,7 +9,7 @@
 #include "CCRenderSurface.h"
 #include "IntRect.h"
 #include "Region.h"
-#include "RenderSurfaceChromium.h"
+#include "cc/render_surface.h"
 
 namespace WebKitTests {
 
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 88db711..8ec2686 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -12,11 +12,11 @@
 #include "CCTiledLayerImpl.h"
 #include "IntRect.h"
 #include "IntSize.h"
-#include "LayerTextureUpdater.h"
 #include "Region.h"
-#include "TextureCopier.h"
-#include "TextureUploader.h"
-#include "TiledLayerChromium.h"
+#include "cc/layer_texture_updater.h"
+#include "cc/texture_copier.h"
+#include "cc/texture_uploader.h"
+#include "cc/tiled_layer.h"
 
 namespace WebKitTests {
 
diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc
index f60abf6..73121b8 100644
--- a/cc/texture_copier.cc
+++ b/cc/texture_copier.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "TextureCopier.h"
+#include "cc/texture_copier.h"
 
 #include "CCRendererGL.h" // For the GLC() macro.
 #include "GraphicsContext3D.h"
diff --git a/cc/texture_copier.h b/cc/texture_copier.h
index 548c6f1..e679805 100644
--- a/cc/texture_copier.h
+++ b/cc/texture_copier.h
@@ -5,10 +5,10 @@
 #ifndef TextureCopier_h
 #define TextureCopier_h
 
-#include "base/basictypes.h"
 #include "GraphicsContext3D.h"
-#include "ProgramBinding.h"
-#include "ShaderChromium.h"
+#include "base/basictypes.h"
+#include "cc/program_binding.h"
+#include "cc/shader.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
diff --git a/cc/texture_copier_unittest.cc b/cc/texture_copier_unittest.cc
index d3dae9d..5d0a58e 100644
--- a/cc/texture_copier_unittest.cc
+++ b/cc/texture_copier_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "TextureCopier.h"
+#include "cc/texture_copier.h"
 
 #include "GraphicsContext3D.h"
 #include "cc/test/fake_web_graphics_context_3d.h"
diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc
index bb449f3..2b37e6d 100644
--- a/cc/texture_layer.cc
+++ b/cc/texture_layer.cc
@@ -4,11 +4,11 @@
 
 #include "config.h"
 
-#include "TextureLayerChromium.h"
+#include "cc/texture_layer.h"
 
 #include "CCLayerTreeHost.h"
 #include "CCTextureLayerImpl.h"
-#include "TextureLayerChromiumClient.h"
+#include "cc/texture_layer_client.h"
 
 namespace cc {
 
diff --git a/cc/texture_layer.h b/cc/texture_layer.h
index 1f04c65..b1d5b9f 100644
--- a/cc/texture_layer.h
+++ b/cc/texture_layer.h
@@ -5,7 +5,7 @@
 #ifndef TextureLayerChromium_h
 #define TextureLayerChromium_h
 
-#include "LayerChromium.h"
+#include "cc/layer.h"
 
 namespace WebKit {
 class WebGraphicsContext3D;
diff --git a/cc/texture_layer_unittest.cc b/cc/texture_layer_unittest.cc
index 7f71a16..f849189 100644
--- a/cc/texture_layer_unittest.cc
+++ b/cc/texture_layer_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "TextureLayerChromium.h"
+#include "cc/texture_layer.h"
 
 #include "CCLayerTreeHost.h"
 #include "cc/test/fake_layer_tree_host_client.h"
diff --git a/cc/texture_update_controller.cc b/cc/texture_update_controller.cc
index 10ab12b..1a28ab92 100644
--- a/cc/texture_update_controller.cc
+++ b/cc/texture_update_controller.cc
@@ -7,9 +7,9 @@
 #include "CCTextureUpdateController.h"
 
 #include "CCResourceProvider.h"
-#include "TextureCopier.h"
-#include "TextureUploader.h"
 #include "TraceEvent.h"
+#include "cc/texture_copier.h"
+#include "cc/texture_uploader.h"
 #include <limits>
 #include <wtf/CurrentTime.h>
 
diff --git a/cc/texture_update_queue.h b/cc/texture_update_queue.h
index 4cf29338..6ee20a9 100644
--- a/cc/texture_update_queue.h
+++ b/cc/texture_update_queue.h
@@ -6,8 +6,8 @@
 #define CCTextureUpdateQueue_h
 
 #include "base/basictypes.h"
-#include "TextureCopier.h"
-#include "TextureUploader.h"
+#include "cc/texture_copier.h"
+#include "cc/texture_uploader.h"
 #include <wtf/Deque.h>
 
 namespace cc {
diff --git a/cc/threaded_unittest.cc b/cc/threaded_unittest.cc
index 66a5a2d..fd25824 100644
--- a/cc/threaded_unittest.cc
+++ b/cc/threaded_unittest.cc
@@ -16,9 +16,9 @@
 #include "CCTextureUpdateQueue.h"
 #include "CCThreadTask.h"
 #include "CCTimingFunction.h"
-#include "ContentLayerChromium.h"
-#include "LayerChromium.h"
 #include "base/stl_util.h"
+#include "cc/content_layer.h"
+#include "cc/layer.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include "cc/test/fake_web_graphics_context_3d.h"
diff --git a/cc/throttled_texture_uploader.cc b/cc/throttled_texture_uploader.cc
index 2d4dbbf..2ad0309 100644
--- a/cc/throttled_texture_uploader.cc
+++ b/cc/throttled_texture_uploader.cc
@@ -3,13 +3,13 @@
 // found in the LICENSE file.
 
 #include "config.h"
-#include "ThrottledTextureUploader.h"
+#include "cc/throttled_texture_uploader.h"
 
 #include "CCPrioritizedTexture.h"
 #include "CCProxy.h"
 #include "Extensions3DChromium.h"
-#include "third_party/skia/include/gpu/SkGpuDevice.h"
 #include "TraceEvent.h"
+#include "third_party/skia/include/gpu/SkGpuDevice.h"
 #include <algorithm>
 #include <public/Platform.h>
 #include <public/WebGraphicsContext3D.h>
diff --git a/cc/throttled_texture_uploader.h b/cc/throttled_texture_uploader.h
index 9f89bf6..9036a8b 100644
--- a/cc/throttled_texture_uploader.h
+++ b/cc/throttled_texture_uploader.h
@@ -5,7 +5,7 @@
 #ifndef ThrottledTextureUploader_h
 #define ThrottledTextureUploader_h
 
-#include "TextureUploader.h"
+#include "cc/texture_uploader.h"
 
 #include "base/basictypes.h"
 #include <deque>
diff --git a/cc/throttled_texture_uploader_unittest.cc b/cc/throttled_texture_uploader_unittest.cc
index 0519494..44bb5fb 100644
--- a/cc/throttled_texture_uploader_unittest.cc
+++ b/cc/throttled_texture_uploader_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "ThrottledTextureUploader.h"
+#include "cc/throttled_texture_uploader.h"
 
 #include "CCPrioritizedTexture.h"
 #include "Extensions3DChromium.h"
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index 03d8a76..1ea1e25 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -4,15 +4,15 @@
 
 #include "config.h"
 
-#include "TiledLayerChromium.h"
+#include "cc/tiled_layer.h"
 
-#include "base/basictypes.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
 #include "CCOverdrawMetrics.h"
 #include "CCTextureUpdateQueue.h"
 #include "CCTiledLayerImpl.h"
 #include "Region.h"
+#include "base/basictypes.h"
 
 using namespace std;
 using WebKit::WebTransformationMatrix;
diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h
index aa57819..6163391 100644
--- a/cc/tiled_layer.h
+++ b/cc/tiled_layer.h
@@ -6,8 +6,8 @@
 #define TiledLayerChromium_h
 
 #include "CCLayerTilingData.h"
-#include "LayerChromium.h"
-#include "LayerTextureUpdater.h"
+#include "cc/layer.h"
+#include "cc/layer_texture_updater.h"
 
 namespace cc {
 class UpdatableTile;
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index 10ac1e8..11c4acc 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -4,14 +4,14 @@
 
 #include "config.h"
 
-#include "TiledLayerChromium.h"
+#include "cc/tiled_layer.h"
 
-#include "BitmapCanvasLayerTextureUpdater.h"
 #include "CCOverdrawMetrics.h"
 #include "CCRenderingStats.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include "CCTextureUpdateController.h"
-#include "LayerPainterChromium.h"
+#include "cc/bitmap_canvas_layer_texture_updater.h"
+#include "cc/layer_painter.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_graphics_context.h"
 #include "cc/test/fake_layer_tree_host_client.h"
diff --git a/cc/tree_synchronizer.cc b/cc/tree_synchronizer.cc
index b7e76bb..fdea6e2 100644
--- a/cc/tree_synchronizer.cc
+++ b/cc/tree_synchronizer.cc
@@ -4,13 +4,13 @@
 
 #include "config.h"
 
-#include "TreeSynchronizer.h"
+#include "cc/tree_synchronizer.h"
 
 #include "CCLayerImpl.h"
 #include "CCScrollbarAnimationController.h"
 #include "CCScrollbarLayerImpl.h"
-#include "LayerChromium.h"
-#include "ScrollbarLayerChromium.h"
+#include "cc/layer.h"
+#include "cc/scrollbar_layer.h"
 
 namespace cc {
 
diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc
index 4d16ad3..9d9320b 100644
--- a/cc/tree_synchronizer_unittest.cc
+++ b/cc/tree_synchronizer_unittest.cc
@@ -4,14 +4,14 @@
 
 #include "config.h"
 
-#include "TreeSynchronizer.h"
+#include "cc/tree_synchronizer.h"
 
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCProxy.h"
 #include "CCSingleThreadProxy.h"
-#include "LayerChromium.h"
 #include "Region.h"
+#include "cc/layer.h"
 #include "cc/test/animation_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/unthrottled_texture_uploader.cc b/cc/unthrottled_texture_uploader.cc
index 6d83e52..4aaf6b0 100644
--- a/cc/unthrottled_texture_uploader.cc
+++ b/cc/unthrottled_texture_uploader.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "UnthrottledTextureUploader.h"
+#include "cc/unthrottled_texture_uploader.h"
 
 #include "CCPrioritizedTexture.h"
 
diff --git a/cc/unthrottled_texture_uploader.h b/cc/unthrottled_texture_uploader.h
index bc0822a..7fa02e3 100644
--- a/cc/unthrottled_texture_uploader.h
+++ b/cc/unthrottled_texture_uploader.h
@@ -5,9 +5,9 @@
 #ifndef UnthrottledTextureUploader_h
 #define UnthrottledTextureUploader_h
 
-#include "base/basictypes.h"
 #include "CCResourceProvider.h"
-#include "TextureUploader.h"
+#include "base/basictypes.h"
+#include "cc/texture_uploader.h"
 
 namespace cc {
 
diff --git a/cc/video_layer.cc b/cc/video_layer.cc
index 8f0ec9b..5bf7982 100644
--- a/cc/video_layer.cc
+++ b/cc/video_layer.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "VideoLayerChromium.h"
+#include "cc/video_layer.h"
 
 #include "CCVideoLayerImpl.h"
 
diff --git a/cc/video_layer.h b/cc/video_layer.h
index 6e29213..9f415f2 100644
--- a/cc/video_layer.h
+++ b/cc/video_layer.h
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #ifndef VideoLayerChromium_h
 #define VideoLayerChromium_h
 
-#include "LayerChromium.h"
+#include "cc/layer.h"
 
 namespace WebKit {
 class WebVideoFrameProvider;