3 files changed, 24 insertions, 3 deletions
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index f728818..1ee736f 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -10,7 +10,14 @@
 #include "cc/layer_impl.h"
 #include <public/WebTransformOperations.h>
 
-using namespace cc;
+using cc::ActiveAnimation;
+using cc::AnimationCurve;
+using cc::EaseTimingFunction;
+using cc::FloatKeyframe;
+using cc::KeyframedFloatAnimationCurve;
+using cc::KeyframedTransformAnimationCurve;
+using cc::TimingFunction;
+using cc::TransformKeyframe;
 
 namespace {
 
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index 3fe084f..1c26647 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -27,7 +27,14 @@
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 
-using namespace cc;
+using cc::InputHandler;
+using cc::Layer;
+using cc::LayerTreeHostImplClient;
+using cc::LayerTreeSettings;
+using cc::Proxy;
+using cc::ScopedThreadProxy;
+using cc::Settings;
+
 using namespace WebKit;
 
 namespace WebKitTests {
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc
index f8db177..4336eac 100644
--- a/cc/test/tiled_layer_test_common.cc
+++ b/cc/test/tiled_layer_test_common.cc
@@ -4,7 +4,14 @@
 
 #include "cc/test/tiled_layer_test_common.h"
 
-using namespace cc;
+using cc::LayerTilingData;
+using cc::LayerUpdater;
+using cc::PriorityCalculator;
+using cc::PrioritizedResource;
+using cc::PrioritizedResourceManager;
+using cc::RenderingStats;
+using cc::ResourceUpdate;
+using cc::ResourceUpdateQueue;
 
 namespace WebKitTests {