summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-18 09:34:48 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-18 09:34:48 +0000
commitcdb284d7a99f11f80fa07ac0390eacf65322d1ef (patch)
tree9268fd0d17b0d41dbfd3548e6286434393e045e3 /cc/test
parentd59adfc29b142ce07e26822203f432658473504a (diff)
downloadchromium_src-cdb284d7a99f11f80fa07ac0390eacf65322d1ef.zip
chromium_src-cdb284d7a99f11f80fa07ac0390eacf65322d1ef.tar.gz
chromium_src-cdb284d7a99f11f80fa07ac0390eacf65322d1ef.tar.bz2
Part 11 of cc/ directory shuffles: fix up stragglers
Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681 This moves files left behind in previous patches and completes the series. BUG=190824 TBR=enne@chromium.org Review URL: https://codereview.chromium.org/12916002 Review URL: https://codereview.chromium.org/12604010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/animation_test_common.cc2
-rw-r--r--cc/test/layer_tree_test_common.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index 8711b35..99435e8 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -6,9 +6,9 @@
#include "cc/animation/keyframed_animation_curve.h"
#include "cc/animation/layer_animation_controller.h"
+#include "cc/animation/transform_operations.h"
#include "cc/layers/layer.h"
#include "cc/layers/layer_impl.h"
-#include "cc/transform_operations.h"
using cc::Animation;
using cc::AnimationCurve;
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index f3592a8..4f30730 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -7,6 +7,7 @@
#include "cc/animation/animation.h"
#include "cc/animation/animation_registrar.h"
#include "cc/animation/layer_animation_controller.h"
+#include "cc/animation/timing_function.h"
#include "cc/base/thread_impl.h"
#include "cc/input/input_handler.h"
#include "cc/layers/content_layer.h"
@@ -17,7 +18,6 @@
#include "cc/test/fake_output_surface.h"
#include "cc/test/occlusion_tracker_test_common.h"
#include "cc/test/tiled_layer_test_common.h"
-#include "cc/timing_function.h"
#include "cc/trees/layer_tree_host_impl.h"
#include "cc/trees/single_thread_proxy.h"
#include "testing/gmock/include/gmock/gmock.h"