summaryrefslogtreecommitdiffstats
path: root/cc/layer_tree_host_unittest.cc
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/layer_tree_host_unittest.cc
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/layer_tree_host_unittest.cc')
-rw-r--r--cc/layer_tree_host_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index ec7c65b..dcce06c 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -10,6 +10,9 @@
#include "CCLayerTreeHostImpl.h"
#include "CCSettings.h"
#include "CCSingleThreadProxy.h"
+#include "CCTextureUpdateQueue.h"
+#include "CCThreadedTest.h"
+#include "CCTimingFunction.h"
#include "Extensions3DChromium.h"
#include "base/synchronization/lock.h"
#include "cc/content_layer.h"
@@ -17,9 +20,6 @@
#include "cc/test/fake_web_compositor_output_surface.h"
#include "cc/test/geometry_test_utils.h"
#include "cc/test/occlusion_tracker_test_common.h"
-#include "cc/texture_update_queue.h"
-#include "cc/threaded_unittest.h"
-#include "cc/timing_function.h"
#include "testing/gmock/include/gmock/gmock.h"
#include <public/Platform.h>
#include <public/WebLayerScrollClient.h>