summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 00:29:30 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 00:29:30 +0000
commit1c0088fc6cfec7c21c20a147218f49b8e34e21c0 (patch)
tree4939597b2ca0d1357fa1f417a6a901159376854a /cc/test
parent57fe2460cc1baaaa66d691218de03b2cae77572b (diff)
downloadchromium_src-1c0088fc6cfec7c21c20a147218f49b8e34e21c0.zip
chromium_src-1c0088fc6cfec7c21c20a147218f49b8e34e21c0.tar.gz
chromium_src-1c0088fc6cfec7c21c20a147218f49b8e34e21c0.tar.bz2
Revert 162284 - cc: Get rid of CC*.h temporary header files.
BUG=155413 TEST=cc_unittests R=enne@chromium.org,jamesr@chromium.org Review URL: https://codereview.chromium.org/11145033 TBR=tfarina@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/animation_test_common.h4
-rw-r--r--cc/test/scheduler_test_common.h2
-rw-r--r--cc/test/tiled_layer_test_common.h6
3 files changed, 6 insertions, 6 deletions
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h
index 614973a..a768930 100644
--- a/cc/test/animation_test_common.h
+++ b/cc/test/animation_test_common.h
@@ -5,8 +5,8 @@
#ifndef CCAnimationTestCommon_h
#define CCAnimationTestCommon_h
-#include "cc/active_animation.h"
-#include "cc/animation_curve.h"
+#include "CCActiveAnimation.h"
+#include "CCAnimationCurve.h"
#include "CCLayerAnimationController.h"
#include "IntSize.h"
diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 5db76a8..2f6660b 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -7,7 +7,7 @@
#include "CCDelayBasedTimeSource.h"
#include "CCFrameRateController.h"
-#include "cc/thread.h"
+#include "CCThread.h"
#include "base/threading/platform_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 dea056f..8ec2686 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -7,9 +7,9 @@
#include "CCGraphicsContext.h"
#include "CCPrioritizedTexture.h"
-#include "cc/resource_provider.h"
-#include "cc/texture_update_queue.h"
-#include "cc/tiled_layer_impl.h"
+#include "CCResourceProvider.h"
+#include "CCTextureUpdateQueue.h"
+#include "CCTiledLayerImpl.h"
#include "IntRect.h"
#include "IntSize.h"
#include "Region.h"