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

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

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

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

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

29 files changed, 16 insertions, 117 deletions

diff --git a/cc/test/CCAnimationTestCommon.h b/cc/test/CCAnimationTestCommon.h
deleted file mode 100644
index 975865b..0000000
--- a/cc/test/CCAnimationTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/animation_test_common.h"
diff --git a/cc/test/CCGeometryTestUtils.h b/cc/test/CCGeometryTestUtils.h
deleted file mode 100644
index 713965b..0000000
--- a/cc/test/CCGeometryTestUtils.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/geometry_test_utils.h"
diff --git a/cc/test/CCLayerTestCommon.h b/cc/test/CCLayerTestCommon.h
deleted file mode 100644
index 5c7eab2..0000000
--- a/cc/test/CCLayerTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/layer_test_common.h"
diff --git a/cc/test/CCOcclusionTrackerTestCommon.h b/cc/test/CCOcclusionTrackerTestCommon.h
deleted file mode 100644
index 547d2af..0000000
--- a/cc/test/CCOcclusionTrackerTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/occlusion_tracker_test_common.h"
diff --git a/cc/test/CCRenderPassTestCommon.h b/cc/test/CCRenderPassTestCommon.h
deleted file mode 100644
index 18ed36e..0000000
--- a/cc/test/CCRenderPassTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/render_pass_test_common.h"
diff --git a/cc/test/CCSchedulerTestCommon.h b/cc/test/CCSchedulerTestCommon.h
deleted file mode 100644
index abfb555..0000000
--- a/cc/test/CCSchedulerTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/scheduler_test_common.h"
diff --git a/cc/test/CCTestCommon.h b/cc/test/CCTestCommon.h
deleted file mode 100644
index 3556e10..0000000
--- a/cc/test/CCTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/test_common.h"
diff --git a/cc/test/CCTiledLayerTestCommon.h b/cc/test/CCTiledLayerTestCommon.h
deleted file mode 100644
index b6d4584..0000000
--- a/cc/test/CCTiledLayerTestCommon.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/tiled_layer_test_common.h"
diff --git a/cc/test/CompositorFakeWebGraphicsContext3D.h b/cc/test/CompositorFakeWebGraphicsContext3D.h
deleted file mode 100644
index 0776746..0000000
--- a/cc/test/CompositorFakeWebGraphicsContext3D.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/compositor_fake_web_graphics_context_3d.h"
diff --git a/cc/test/FakeCCGraphicsContext.h b/cc/test/FakeCCGraphicsContext.h
deleted file mode 100644
index dbf1627..0000000
--- a/cc/test/FakeCCGraphicsContext.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/fake_graphics_context.h"
diff --git a/cc/test/FakeCCLayerTreeHostClient.h b/cc/test/FakeCCLayerTreeHostClient.h
deleted file mode 100644
index 0c4bf37..0000000
--- a/cc/test/FakeCCLayerTreeHostClient.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/fake_layer_tree_host_client.h"
diff --git a/cc/test/FakeWebCompositorOutputSurface.h b/cc/test/FakeWebCompositorOutputSurface.h
deleted file mode 100644
index e42fc08..0000000
--- a/cc/test/FakeWebCompositorOutputSurface.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/fake_web_compositor_output_surface.h"
diff --git a/cc/test/FakeWebCompositorSoftwareOutputDevice.h b/cc/test/FakeWebCompositorSoftwareOutputDevice.h
deleted file mode 100644
index 4d87f1c..0000000
--- a/cc/test/FakeWebCompositorSoftwareOutputDevice.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/fake_web_compositor_software_output_device.h"
diff --git a/cc/test/FakeWebGraphicsContext3D.h b/cc/test/FakeWebGraphicsContext3D.h
deleted file mode 100644
index bdb1732..0000000
--- a/cc/test/FakeWebGraphicsContext3D.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/fake_web_graphics_context_3d.h"
diff --git a/cc/test/FakeWebScrollbarThemeGeometry.h b/cc/test/FakeWebScrollbarThemeGeometry.h
deleted file mode 100644
index eed0de8..0000000
--- a/cc/test/FakeWebScrollbarThemeGeometry.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/fake_web_scrollbar_theme_geometry.h"
diff --git a/cc/test/MockCCQuadCuller.h b/cc/test/MockCCQuadCuller.h
deleted file mode 100644
index 5c632df..0000000
--- a/cc/test/MockCCQuadCuller.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/mock_quad_culler.h"
diff --git a/cc/test/WebCompositorInitializer.h b/cc/test/WebCompositorInitializer.h
deleted file mode 100644
index ed922d6..0000000
--- a/cc/test/WebCompositorInitializer.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Temporary forwarding header
-#include "cc/test/web_compositor_initializer.h"
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index 9c76834..e7264ee 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCAnimationTestCommon.h"
+#include "cc/test/animation_test_common.h"
 
 #include "CCKeyframedAnimationCurve.h"
 #include "CCLayerAnimationController.h"
diff --git a/cc/test/compositor_fake_web_graphics_context_3d.h b/cc/test/compositor_fake_web_graphics_context_3d.h
index 2a709a2..f76b042 100644
--- a/cc/test/compositor_fake_web_graphics_context_3d.h
+++ b/cc/test/compositor_fake_web_graphics_context_3d.h
@@ -5,7 +5,7 @@
 #ifndef CompositorFakeWebGraphicsContext3D_h
 #define CompositorFakeWebGraphicsContext3D_h
 
-#include "FakeWebGraphicsContext3D.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebKit {
diff --git a/cc/test/fake_graphics_context.h b/cc/test/fake_graphics_context.h
index a592bf0..755ac3d 100644
--- a/cc/test/fake_graphics_context.h
+++ b/cc/test/fake_graphics_context.h
@@ -6,8 +6,8 @@
 #define FakeCCGraphicsContext_h
 
 #include "CCGraphicsContext.h"
-#include "CompositorFakeWebGraphicsContext3D.h"
-#include "FakeWebCompositorOutputSurface.h"
+#include "cc/test/compositor_fake_web_graphics_context_3d.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
 #include <public/WebCompositorOutputSurface.h>
 
 namespace WebKit {
diff --git a/cc/test/fake_graphics_context_3d_unittest.cc b/cc/test/fake_graphics_context_3d_unittest.cc
index bb06e64..57912295 100644
--- a/cc/test/fake_graphics_context_3d_unittest.cc
+++ b/cc/test/fake_graphics_context_3d_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "FakeWebGraphicsContext3D.h"
+#include "cc/test/fake_web_graphics_context_3d.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/test/fake_layer_tree_host_client.cc b/cc/test/fake_layer_tree_host_client.cc
index b658810..36b5cc4 100644
--- a/cc/test/fake_layer_tree_host_client.cc
+++ b/cc/test/fake_layer_tree_host_client.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "FakeCCLayerTreeHostClient.h"
+#include "cc/test/fake_layer_tree_host_client.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h
index ef71715..e4e335f 100644
--- a/cc/test/fake_layer_tree_host_client.h
+++ b/cc/test/fake_layer_tree_host_client.h
@@ -6,11 +6,11 @@
 
 #include "config.h"
 
-#include "base/memory/scoped_ptr.h"
 #include "CCInputHandler.h"
 #include "CCLayerTreeHost.h"
-#include "CompositorFakeWebGraphicsContext3D.h"
-#include "FakeWebCompositorOutputSurface.h"
+#include "base/memory/scoped_ptr.h"
+#include "cc/test/compositor_fake_web_graphics_context_3d.h"
+#include "cc/test/fake_web_compositor_output_surface.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_web_compositor_output_surface.h b/cc/test/fake_web_compositor_output_surface.h
index 179576f..2d3128c 100644
--- a/cc/test/fake_web_compositor_output_surface.h
+++ b/cc/test/fake_web_compositor_output_surface.h
@@ -6,7 +6,7 @@
 #define FakeWebCompositorOutputSurface_h
 
 #include "base/memory/scoped_ptr.h"
-#include "FakeWebCompositorSoftwareOutputDevice.h"
+#include "cc/test/fake_web_compositor_software_output_device.h"
 #include <public/WebCompositorOutputSurface.h>
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/OwnPtr.h>
diff --git a/cc/test/geometry_test_utils.cc b/cc/test/geometry_test_utils.cc
index a079475..a76517c 100644
--- a/cc/test/geometry_test_utils.cc
+++ b/cc/test/geometry_test_utils.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCGeometryTestUtils.h"
+#include "cc/test/geometry_test_utils.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index f62c488..fda251c 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -4,7 +4,8 @@
 
 #include "config.h"
 
-#include "CCLayerTestCommon.h"
+#include "cc/test/layer_test_common.h"
+
 #include "CCDrawQuad.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/test/mock_quad_culler.cc b/cc/test/mock_quad_culler.cc
index 96cd206..282dddc 100644
--- a/cc/test/mock_quad_culler.cc
+++ b/cc/test/mock_quad_culler.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "MockCCQuadCuller.h"
+#include "cc/test/mock_quad_culler.h"
 
 namespace cc {
 
diff --git a/cc/test/scheduler_test_common.cc b/cc/test/scheduler_test_common.cc
index 728cdc5..3e58f36 100644
--- a/cc/test/scheduler_test_common.cc
+++ b/cc/test/scheduler_test_common.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCSchedulerTestCommon.h"
+#include "cc/test/scheduler_test_common.h"
 
 namespace WebKitTests {
 
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc
index 12d50c7..6747dfd 100644
--- a/cc/test/tiled_layer_test_common.cc
+++ b/cc/test/tiled_layer_test_common.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCTiledLayerTestCommon.h"
+#include "cc/test/tiled_layer_test_common.h"
 
 using namespace cc;