cc: Remove forbidden using namespace directives.

BUG=144576,144577
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org,danakj@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11410022

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

47 files changed, 139 insertions, 109 deletions

diff --git a/cc/active_animation_unittest.cc b/cc/active_animation_unittest.cc
index a24218c..2e7a959 100644
--- a/cc/active_animation_unittest.cc
+++ b/cc/active_animation_unittest.cc
@@ -9,8 +9,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace WebKitTests;
-using namespace cc;
 
+namespace cc {
 namespace {
 
 scoped_ptr<ActiveAnimation> createActiveAnimation(int iterations, double duration)
@@ -216,4 +216,5 @@ TEST(ActiveAnimationTest, RunStateChangesIgnoredWhileSuspended)
     EXPECT_EQ(ActiveAnimation::Running, anim->runState());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/content_layer_unittest.cc b/cc/content_layer_unittest.cc
index 2788129e..c7f32be 100644
--- a/cc/content_layer_unittest.cc
+++ b/cc/content_layer_unittest.cc
@@ -12,9 +12,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect_conversions.h"
 
-using namespace cc;
 using namespace WebKit;
 
+namespace cc {
 namespace {
 
 class MockContentLayerClient : public ContentLayerClient {
@@ -49,4 +49,5 @@ TEST(ContentLayerTest, ContentLayerPainterWithDeviceScale)
     EXPECT_RECT_EQ(gfx::ToEnclosingRect(opaqueRectInContentSpace), resultingOpaqueRect);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/contents_scaling_layer_unittest.cc b/cc/contents_scaling_layer_unittest.cc
index 5699ada..1825641 100644
--- a/cc/contents_scaling_layer_unittest.cc
+++ b/cc/contents_scaling_layer_unittest.cc
@@ -7,8 +7,7 @@
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
-
+namespace cc {
 namespace {
 
 class MockContentsScalingLayer : public ContentsScalingLayer {
@@ -75,4 +74,5 @@ TEST(ContentsScalingLayerTest, checkContentsScaleChangeTriggersNeedsDisplay) {
                        testLayer->lastNeedsDisplayRect());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc
index 23e0a15..008dc93 100644
--- a/cc/damage_tracker_unittest.cc
+++ b/cc/damage_tracker_unittest.cc
@@ -15,10 +15,10 @@
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 
-using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 void executeCalculateDrawTransformsAndVisibility(LayerImpl* root, std::vector<LayerImpl*>& renderSurfaceLayerList)
@@ -1155,4 +1155,5 @@ TEST_F(DamageTrackerTest, verifyDamageAccumulatesUntilReset)
     EXPECT_TRUE(rootDamageRect.IsEmpty());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/delay_based_time_source_unittest.cc b/cc/delay_based_time_source_unittest.cc
index af8139d..1ab0ca9 100644
--- a/cc/delay_based_time_source_unittest.cc
+++ b/cc/delay_based_time_source_unittest.cc
@@ -8,9 +8,9 @@
 #include "cc/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 base::TimeDelta interval()
@@ -372,4 +372,5 @@ TEST(DelayBasedTimeSource, TestDeactivateAndReactivateAfterNextTickTime)
     EXPECT_EQ(13, thread.pendingDelayMs());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc
index c7cebcc..ced90a2 100644
--- a/cc/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/delegated_renderer_layer_impl_unittest.cc
@@ -25,9 +25,9 @@ using WebKit::FakeWebCompositorOutputSurface;
 using WebKit::FakeWebGraphicsContext3D;
 using WebKit::WebTransformationMatrix;
 
-using namespace cc;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 class DelegatedRendererLayerImplTest : public testing::Test, public LayerTreeHostImplClient {
@@ -452,4 +452,5 @@ TEST_F(DelegatedRendererLayerImplTestSharedData, SharedData)
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, sharedState->quadTransform);
 }
 
-}  // annonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc
index 12388c8..229cb33 100644
--- a/cc/draw_quad_unittest.cc
+++ b/cc/draw_quad_unittest.cc
@@ -19,8 +19,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-using namespace cc;
-
+namespace cc {
 namespace {
 
 TEST(DrawQuadTest, copySharedQuadState)
@@ -304,4 +303,5 @@ TEST(DrawQuadTest, copyYUVVideoDrawQuad)
     EXPECT_EQ(vPlane.format, copyQuad->vPlane().format);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/float_quad_unittest.cc b/cc/float_quad_unittest.cc
index 901022c..93ebc60 100644
--- a/cc/float_quad_unittest.cc
+++ b/cc/float_quad_unittest.cc
@@ -8,9 +8,9 @@
 #include "ui/gfx/quad_f.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using WebKit::WebTransformationMatrix;
 
+namespace cc {
 namespace {
 
 // TODO(danakj) Move this test to ui/gfx/ when we don't use WebTransformationMatrix.
@@ -56,4 +56,5 @@ TEST(FloatQuadTest, IsRectilinearTest)
     }
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/frame_rate_controller_unittest.cc b/cc/frame_rate_controller_unittest.cc
index 7a6b02b5..63142b2 100644
--- a/cc/frame_rate_controller_unittest.cc
+++ b/cc/frame_rate_controller_unittest.cc
@@ -7,9 +7,9 @@
 #include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 class FakeFrameRateControllerClient : public cc::FrameRateControllerClient {
@@ -165,4 +165,5 @@ TEST(FrameRateControllerTest, TestFrameThrottling_Unthrottled)
     EXPECT_TRUE(client.vsyncTicked());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index f89af2f..b530b7b 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -17,10 +17,10 @@
 #include "third_party/khronos/GLES2/gl2.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 class FrameCountingMemoryAllocationSettingContext : public FakeWebGraphicsContext3D {
@@ -536,4 +536,5 @@ TEST(GLRendererTest2, activeTextureState)
     EXPECT_EQ(context->activeTexture(), GL_TEXTURE0);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/heads_up_display_unittest.cc b/cc/heads_up_display_unittest.cc
index 0c2ae76..ce08e20 100644
--- a/cc/heads_up_display_unittest.cc
+++ b/cc/heads_up_display_unittest.cc
@@ -7,9 +7,9 @@
 #include "cc/layer_tree_host.h"
 #include "cc/test/layer_tree_test_common.h"
 
-using namespace cc;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 class HeadsUpDisplayTest : public ThreadedTest {
@@ -108,4 +108,5 @@ TEST_F(HudWithRootLayerChange, runMultiThread)
     runTest(true);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/keyframed_animation_curve_unittest.cc b/cc/keyframed_animation_curve_unittest.cc
index e4fd93f..6e6eea9 100644
--- a/cc/keyframed_animation_curve_unittest.cc
+++ b/cc/keyframed_animation_curve_unittest.cc
@@ -9,9 +9,9 @@
 #include <public/WebTransformOperations.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using WebKit::WebTransformationMatrix;
 
+namespace cc {
 namespace {
 
 void expectTranslateX(double translateX, const WebTransformationMatrix& matrix)
@@ -201,4 +201,5 @@ TEST(KeyframedAnimationCurveTest, CubicBezierTimingFunction)
     EXPECT_FLOAT_EQ(1, curve->getValue(1));
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/layer_animation_controller_unittest.cc b/cc/layer_animation_controller_unittest.cc
index b11db33..b0d6058 100644
--- a/cc/layer_animation_controller_unittest.cc
+++ b/cc/layer_animation_controller_unittest.cc
@@ -11,10 +11,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using namespace WebKitTests;
 using WebKit::WebTransformationMatrix;
 
+namespace cc {
 namespace {
 
 void expectTranslateX(double translateX, const WebTransformationMatrix& matrix)
@@ -556,4 +556,5 @@ TEST(LayerAnimationControllerTest, ForceSyncWhenSynchronizedStartTimeNeeded)
     EXPECT_EQ(ActiveAnimation::WaitingForTargetAvailability, activeAnimation->runState());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc
index 8e1d0aa..3a2a431 100644
--- a/cc/layer_impl_unittest.cc
+++ b/cc/layer_impl_unittest.cc
@@ -11,9 +11,9 @@
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 
-using namespace cc;
 using namespace WebKit;
 
+namespace cc {
 namespace {
 
 #define EXECUTE_AND_VERIFY_SUBTREE_CHANGED(codeToTest)                  \
@@ -160,4 +160,5 @@ TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly)
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setBounds(arbitrarySize));
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/layer_iterator_unittest.cc b/cc/layer_iterator_unittest.cc
index d2abd4d..0d5be64 100644
--- a/cc/layer_iterator_unittest.cc
+++ b/cc/layer_iterator_unittest.cc
@@ -10,13 +10,13 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using WebKit::WebTransformationMatrix;
 using ::testing::Mock;
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::AnyNumber;
 
+namespace cc {
 namespace {
 
 class TestLayer : public Layer {
@@ -250,4 +250,5 @@ TEST(LayerIteratorTest, complexTreeMultiSurface)
     EXPECT_COUNT(root3, -1, -1, 0);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/layer_quad_unittest.cc b/cc/layer_quad_unittest.cc
index 64d8c77..34e79d9 100644
--- a/cc/layer_quad_unittest.cc
+++ b/cc/layer_quad_unittest.cc
@@ -7,8 +7,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/quad_f.h"
 
-using namespace cc;
-
+namespace cc {
 namespace {
 
 TEST(LayerQuadTest, QuadFConversion)
@@ -41,4 +40,5 @@ TEST(LayerQuadTest, Inflate)
     EXPECT_TRUE(layerQuad.ToQuadF() == quad);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/layer_sorter_unittest.cc b/cc/layer_sorter_unittest.cc
index 015bc7b..a4a8cee 100644
--- a/cc/layer_sorter_unittest.cc
+++ b/cc/layer_sorter_unittest.cc
@@ -10,9 +10,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using WebKit::WebTransformationMatrix;
 
+namespace cc {
 namespace {
 
 // Note: In the following overlap tests, the "camera" is looking down the negative Z axis,
@@ -260,4 +260,5 @@ TEST(LayerSorterTest, verifyExistingOrderingPreservedWhenNoZDiff)
     EXPECT_EQ(5, layerList[4]->id());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc
index 6dec444..30aa943 100644
--- a/cc/layer_tree_host_common_unittest.cc
+++ b/cc/layer_tree_host_common_unittest.cc
@@ -20,10 +20,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using namespace WebKitTests;
 using WebKit::WebTransformationMatrix;
 
+namespace cc {
 namespace {
 
 template<typename LayerType>
@@ -4097,4 +4097,5 @@ TEST(LayerTreeHostCommonTest, verifySubtreeSearch)
     EXPECT_EQ(0, LayerTreeHostCommon::findLayerInSubtree(root.get(), nonexistentId));
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index cc3e02c..3e25195 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -47,7 +47,6 @@
 #include <public/WebVideoFrame.h>
 #include <public/WebVideoFrameProvider.h>
 
-using namespace cc;
 using namespace LayerTestCommon;
 using namespace WebKit;
 using namespace WebKitTests;
@@ -59,6 +58,7 @@ using ::testing::AnyNumber;
 using ::testing::AtLeast;
 using ::testing::_;
 
+namespace cc {
 namespace {
 
 // This test is parametrized to run all tests with the
@@ -4440,4 +4440,5 @@ INSTANTIATE_TEST_CASE_P(LayerTreeHostImplTests,
                         LayerTreeHostImplTest,
                         ::testing::Values(false, true));
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index 5f808f0..633b8ff 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -27,10 +27,10 @@
 #include <public/WebLayerScrollClient.h>
 #include <public/WebSize.h>
 
-using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 class LayerTreeHostTest : public ThreadedTest { };
@@ -3222,4 +3222,5 @@ TEST_F(LayerTreeHostTestDeferCommits, runMultiThread)
     runTest(true);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
index 0e6baad..6c26de5 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layer_unittest.cc
@@ -18,7 +18,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using namespace WebKitTests;
 using WebKit::WebTransformationMatrix;
 using ::testing::Mock;
@@ -32,6 +31,7 @@ using ::testing::AnyNumber;
         Mock::VerifyAndClearExpectations(m_layerTreeHost.get());                                      \
     } while (0)
 
+namespace cc {
 namespace {
 
 class MockLayerImplTreeHost : public LayerTreeHost {
@@ -795,5 +795,5 @@ TEST(LayerTestWithoutFixture, setBoundsTriggersSetNeedsRedrawAfterGettingNonEmpt
     EXPECT_TRUE(layer->needsDisplay());
 }
 
-
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/math_util_unittest.cc b/cc/math_util_unittest.cc
index 6d929d9..c29bb12 100644
--- a/cc/math_util_unittest.cc
+++ b/cc/math_util_unittest.cc
@@ -13,9 +13,9 @@
 #include "ui/gfx/rect_f.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using WebKit::WebTransformationMatrix;
 
+namespace cc {
 namespace {
 
 TEST(MathUtilTest, verifyBackfaceVisibilityBasicCases)
@@ -180,4 +180,5 @@ TEST(MathUtilTest, vectorProjection)
               projectedVector.y() / targetVector.y());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/nine_patch_layer_impl_unittest.cc b/cc/nine_patch_layer_impl_unittest.cc
index 5539e3c..0c339cb 100644
--- a/cc/nine_patch_layer_impl_unittest.cc
+++ b/cc/nine_patch_layer_impl_unittest.cc
@@ -16,8 +16,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
-
+namespace cc {
 namespace {
 
 gfx::Rect ToRoundedIntRect(gfx::RectF rect_f) {
@@ -87,4 +86,5 @@ TEST(NinePatchLayerImplTest, verifyDrawQuads)
     EXPECT_EQ(texRemaining, apertureRegion);
 }
 
-}
+}  // namespace
+}  // namespace cc
diff --git a/cc/nine_patch_layer_unittest.cc b/cc/nine_patch_layer_unittest.cc
index eb37b6e..0481e61 100644
--- a/cc/nine_patch_layer_unittest.cc
+++ b/cc/nine_patch_layer_unittest.cc
@@ -20,12 +20,12 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
 using ::testing::Mock;
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::AnyNumber;
 
+namespace cc {
 namespace {
 
 class MockLayerTreeHost : public LayerTreeHost {
@@ -133,4 +133,5 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
     EXPECT_EQ(queue.partialUploadSize(), 0);
 }
 
-} // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc
index 7bdc4da..fac2f02 100644
--- a/cc/occlusion_tracker_unittest.cc
+++ b/cc/occlusion_tracker_unittest.cc
@@ -20,10 +20,10 @@
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 class TestContentLayer : public Layer {
@@ -3077,4 +3077,5 @@ protected:
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestMinimumTrackingSize);
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/prioritized_resource_unittest.cc b/cc/prioritized_resource_unittest.cc
index 35a4ac4..a561f76 100644
--- a/cc/prioritized_resource_unittest.cc
+++ b/cc/prioritized_resource_unittest.cc
@@ -12,7 +12,6 @@
 #include "cc/test/tiled_layer_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
 using namespace WebKitTests;
 
 namespace cc {
@@ -96,8 +95,6 @@ protected:
     scoped_ptr<ResourceProvider> m_resourceProvider;
 };
 
-}
-
 namespace {
 
 TEST_F(PrioritizedResourceTest, requestTextureExceedingMaxLimit)
@@ -702,5 +699,5 @@ TEST_F(PrioritizedResourceTest, usageStatistics)
     resourceManager->clearAllMemory(resourceProvider());
 }
 
-
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc
index 7ecb95d..90c27d0 100644
--- a/cc/quad_culler_unittest.cc
+++ b/cc/quad_culler_unittest.cc
@@ -16,9 +16,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using WebKit::WebTransformationMatrix;
 
+namespace cc {
 namespace {
 
 class TestOcclusionTrackerImpl : public OcclusionTrackerImpl {
@@ -464,5 +464,5 @@ TEST(QuadCullerTest, verifyWithoutMetrics)
     EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsCulledForDrawing(), 0, 1);
 }
 
-
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/region_unittest.cc b/cc/region_unittest.cc
index 12d2715..ecb108d 100644
--- a/cc/region_unittest.cc
+++ b/cc/region_unittest.cc
@@ -6,8 +6,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
-
+namespace cc {
 namespace {
 
 #define TEST_INSIDE_RECT(r, x, y, w, h)                      \
@@ -452,3 +451,4 @@ TEST(RegionSwap, Swap) {
 }
 
 }  // namespace
+}  // namespace cc
diff --git a/cc/render_pass_unittest.cc b/cc/render_pass_unittest.cc
index a6c0808..2761170 100644
--- a/cc/render_pass_unittest.cc
+++ b/cc/render_pass_unittest.cc
@@ -17,8 +17,7 @@ using WebKit::WebFilterOperations;
 using WebKit::WebTransformationMatrix;
 using WebKitTests::TestRenderPass;
 
-using namespace cc;
-
+namespace cc {
 namespace {
 
 struct RenderPassSize {
@@ -82,4 +81,5 @@ TEST(RenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
     EXPECT_EQ(sizeof(RenderPassSize), sizeof(RenderPass));
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/render_surface_filters_unittest.cc b/cc/render_surface_filters_unittest.cc
index 71c4a82..17d3ab7 100644
--- a/cc/render_surface_filters_unittest.cc
+++ b/cc/render_surface_filters_unittest.cc
@@ -9,9 +9,9 @@
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 
-using namespace cc;
 using namespace WebKit;
 
+namespace cc {
 namespace {
 
 // Checks whether op can be combined with a following color matrix.
@@ -135,4 +135,5 @@ TEST(RenderSurfaceFiltersTest, testOptimize)
     EXPECT_EQ(3u, optimized.size());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc
index 02ffb2c..e08df85a 100644
--- a/cc/render_surface_unittest.cc
+++ b/cc/render_surface_unittest.cc
@@ -16,9 +16,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using WebKit::WebTransformationMatrix;
 
+namespace cc {
 namespace {
 
 #define EXECUTE_AND_VERIFY_SURFACE_CHANGED(codeToTest)                  \
@@ -151,4 +151,5 @@ TEST(RenderSurfaceTest, sanityCheckSurfaceCreatesCorrectRenderPass)
     EXPECT_EQ(origin, pass->transformToRootTarget());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc
index 5afb829..851144c 100644
--- a/cc/resource_provider_unittest.cc
+++ b/cc/resource_provider_unittest.cc
@@ -16,9 +16,9 @@
 #include "ui/gfx/rect.h"
 #include <public/WebGraphicsContext3D.h>
 
-using namespace cc;
 using namespace WebKit;
 
+namespace cc {
 namespace {
 
 size_t textureSize(const gfx::Size& size, WGC3Denum format)
@@ -585,4 +585,5 @@ INSTANTIATE_TEST_CASE_P(ResourceProviderTests,
                         ::testing::Values(ResourceProvider::GLTexture,
                                           ResourceProvider::Bitmap));
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc
index fc02348..23248a0 100644
--- a/cc/resource_update_controller_unittest.cc
+++ b/cc/resource_update_controller_unittest.cc
@@ -13,11 +13,11 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
-using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 using testing::Test;
 
+namespace cc {
 namespace {
 
 const int kFlushPeriodFull = 4;
@@ -502,4 +502,5 @@ TEST_F(ResourceUpdateControllerTest, UpdatesCompleteInFiniteTime)
     EXPECT_EQ(2, m_numTotalUploads);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/scheduler_state_machine_unittest.cc b/cc/scheduler_state_machine_unittest.cc
index 5fcbb29..c482bc7 100644
--- a/cc/scheduler_state_machine_unittest.cc
+++ b/cc/scheduler_state_machine_unittest.cc
@@ -6,8 +6,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
-
+namespace cc {
 namespace {
 
 const SchedulerStateMachine::CommitState allCommitStates[] = {
@@ -868,4 +867,5 @@ TEST(SchedulerStateMachineTest, TestBeginFrameWhenContextLost)
     EXPECT_EQ(SchedulerStateMachine::ACTION_BEGIN_FRAME, state.nextAction());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/scheduler_unittest.cc b/cc/scheduler_unittest.cc
index ec7cfc1..2441716 100644
--- a/cc/scheduler_unittest.cc
+++ b/cc/scheduler_unittest.cc
@@ -9,9 +9,9 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 class FakeSchedulerClient : public SchedulerClient {
@@ -465,4 +465,5 @@ TEST(SchedulerTest, NoBeginFrameWhenSwapFailsDuringForcedCommit)
     EXPECT_EQ(0, controllerPtr->numFramesPending());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/scoped_resource_unittest.cc b/cc/scoped_resource_unittest.cc
index 0187bbe..9c24c7c 100644
--- a/cc/scoped_resource_unittest.cc
+++ b/cc/scoped_resource_unittest.cc
@@ -10,10 +10,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
-using namespace cc;
 using namespace WebKit;
-using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 TEST(ScopedResourceTest, NewScopedResource)
@@ -98,4 +97,5 @@ TEST(ScopedResourceTest, LeakScopedResource)
     EXPECT_EQ(1u, resourceProvider->numResources());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/scrollbar_animation_controller_linear_fade_unittest.cc
index 0ffe2f4..e335a80 100644
--- a/cc/scrollbar_animation_controller_linear_fade_unittest.cc
+++ b/cc/scrollbar_animation_controller_linear_fade_unittest.cc
@@ -8,8 +8,7 @@
 #include "cc/single_thread_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
-
+namespace cc {
 namespace {
 
 class ScrollbarAnimationControllerLinearFadeTest : public testing::Test {
@@ -112,4 +111,5 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyForceAwakenByPinch)
 
 }
 
-}  // annoymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc
index 94386bc..b01ec88 100644
--- a/cc/scrollbar_layer_unittest.cc
+++ b/cc/scrollbar_layer_unittest.cc
@@ -14,8 +14,7 @@
 #include <public/WebScrollbarThemeGeometry.h>
 #include <public/WebScrollbarThemePainter.h>
 
-using namespace cc;
-
+namespace cc {
 namespace {
 
 class FakeWebScrollbar : public WebKit::WebScrollbar {
@@ -122,4 +121,5 @@ TEST(ScrollbarLayerTest, scrollOffsetSynchronization)
     EXPECT_EQ(300, ccScrollbarLayer->maximum());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc
index 83eab60..a190890 100644
--- a/cc/software_renderer_unittest.cc
+++ b/cc/software_renderer_unittest.cc
@@ -19,10 +19,10 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 class SoftwareRendererTest : public testing::Test, public RendererClient {
@@ -148,4 +148,5 @@ TEST_F(SoftwareRendererTest, tileQuad)
     EXPECT_EQ(SK_ColorCYAN, pixels[outerPixels - outerSize.width() - 2]);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc
index 10afe26..ce5508f 100644
--- a/cc/solid_color_layer_impl_unittest.cc
+++ b/cc/solid_color_layer_impl_unittest.cc
@@ -13,9 +13,9 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
 using namespace LayerTestCommon;
 
+namespace cc {
 namespace {
 
 TEST(SolidColorLayerImplTest, verifyTilingCompleteAndNoOverlap)
@@ -139,4 +139,5 @@ TEST(SolidColorLayerImplTest, verifyOpaqueRect)
     }
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/texture_copier_unittest.cc b/cc/texture_copier_unittest.cc
index 7736319..0a971e6 100644
--- a/cc/texture_copier_unittest.cc
+++ b/cc/texture_copier_unittest.cc
@@ -9,12 +9,12 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
-using namespace cc;
 using namespace WebKit;
 using testing::InSequence;
 using testing::Test;
 using testing::_;
 
+namespace cc {
 namespace {
 
 class MockContext : public FakeWebGraphicsContext3D {
@@ -62,4 +62,5 @@ TEST(TextureCopierTest, testDrawArraysCopy)
     copier->copyTexture(copy);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/texture_layer_unittest.cc b/cc/texture_layer_unittest.cc
index 8cc887b..258f128 100644
--- a/cc/texture_layer_unittest.cc
+++ b/cc/texture_layer_unittest.cc
@@ -12,12 +12,12 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
 using ::testing::Mock;
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::AnyNumber;
 
+namespace cc {
 namespace {
 
 class MockLayerImplTreeHost : public LayerTreeHost {
@@ -180,4 +180,5 @@ TEST_F(TextureLayerTest, syncImplWhenRemovingFromTree)
     Mock::VerifyAndClearExpectations(m_layerTreeHost.get());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/texture_uploader_unittest.cc b/cc/texture_uploader_unittest.cc
index 61beb44..85bc949 100644
--- a/cc/texture_uploader_unittest.cc
+++ b/cc/texture_uploader_unittest.cc
@@ -11,9 +11,9 @@
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
-using namespace cc;
 using namespace WebKit;
 
+namespace cc {
 namespace {
 
 class FakeWebGraphicsContext3DWithQueryTesting : public FakeWebGraphicsContext3D {
@@ -95,4 +95,5 @@ TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking)
     EXPECT_EQ(0, uploader->numBlockingUploads());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc
index eed95f5..3494d16 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/tiled_layer_impl_unittest.cc
@@ -13,9 +13,9 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
 using namespace LayerTestCommon;
 
+namespace cc {
 namespace {
 
 // Create a default tiled layer with textures for all tiles and a default
@@ -225,4 +225,5 @@ TEST(TiledLayerImplTest, tileOpaqueRectForLayerNoBorders)
     }
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index b38cba6..ab0707a 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -20,10 +20,10 @@
 #include "ui/gfx/rect_conversions.h"
 #include <public/WebTransformationMatrix.h>
 
-using namespace cc;
 using namespace WebKitTests;
 using WebKit::WebTransformationMatrix;
 
+namespace cc {
 namespace {
 
 class TestOcclusionTracker : public OcclusionTracker {
@@ -1623,4 +1623,5 @@ TEST_F(TiledLayerTest, nonIntegerContentsScaleIsNotDistortedDuringInvalidation)
     EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/timing_function_unittest.cc b/cc/timing_function_unittest.cc
index b2aaf1d..0558927 100644
--- a/cc/timing_function_unittest.cc
+++ b/cc/timing_function_unittest.cc
@@ -5,8 +5,7 @@
 #include "cc/timing_function.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
-
+namespace cc {
 namespace {
 
 TEST(TimingFunctionTest, CubicBezierTimingFunction) {
@@ -36,4 +35,5 @@ TEST(TimingFunctionTest, CubicBezierTimingFunction) {
   EXPECT_NEAR(function->getValue(1), 1, epsilon);
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc
diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc
index 99f35bd..ae27443 100644
--- a/cc/tree_synchronizer_unittest.cc
+++ b/cc/tree_synchronizer_unittest.cc
@@ -15,9 +15,9 @@
 #include "cc/test/fake_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace cc;
 using namespace WebKitTests;
 
+namespace cc {
 namespace {
 
 class MockLayerImpl : public LayerImpl {
@@ -405,4 +405,5 @@ TEST(TreeSynchronizerTest, synchronizeAnimations)
     EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerAnimationController())->synchronizedAnimations());
 }
 
-}  // anonymous namespace
+}  // namespace
+}  // namespace cc