cc: Fix style for comments at the end of namespaces

Make sure we have a comment at the end of the namespace for each .cc file and
that there are two spaces between the closing brace and the comment.

R=enne


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

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

113 files changed, 124 insertions, 109 deletions

diff --git a/cc/active_animation.cc b/cc/active_animation.cc
index 6346d1b..43f3a01 100644
--- a/cc/active_animation.cc
+++ b/cc/active_animation.cc
@@ -207,4 +207,4 @@ void ActiveAnimation::pushPropertiesTo(ActiveAnimation* other) const
     }
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/active_animation_unittest.cc b/cc/active_animation_unittest.cc
index b2a2f8d..f9b8fcf 100644
--- a/cc/active_animation_unittest.cc
+++ b/cc/active_animation_unittest.cc
@@ -218,4 +218,4 @@ TEST(ActiveAnimationTest, RunStateChangesIgnoredWhileSuspended)
     EXPECT_EQ(ActiveAnimation::Running, anim->runState());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/bitmap_content_layer_updater.cc b/cc/bitmap_content_layer_updater.cc
index 3ff4ba6..64262fb 100644
--- a/cc/bitmap_content_layer_updater.cc
+++ b/cc/bitmap_content_layer_updater.cc
@@ -81,4 +81,4 @@ void BitmapContentLayerUpdater::setOpaque(bool opaque)
     m_opaque = opaque;
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/bitmap_skpicture_content_layer_updater.cc b/cc/bitmap_skpicture_content_layer_updater.cc
index f035aab..a7e6756 100644
--- a/cc/bitmap_skpicture_content_layer_updater.cc
+++ b/cc/bitmap_skpicture_content_layer_updater.cc
@@ -69,4 +69,4 @@ void BitmapSkPictureContentLayerUpdater::paintContentsRect(SkCanvas* canvas, con
     stats.totalRasterizeTimeInSeconds += (base::TimeTicks::Now() - rasterizeBeginTime).InSecondsF();
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/content_layer.cc b/cc/content_layer.cc
index 0cf5471..62f3221 100644
--- a/cc/content_layer.cc
+++ b/cc/content_layer.cc
@@ -106,4 +106,4 @@ void ContentLayer::setContentsOpaque(bool opaque)
         m_updater->setOpaque(opaque);
 }
 
-}
+}  // namespace cc
diff --git a/cc/content_layer_unittest.cc b/cc/content_layer_unittest.cc
index 49677da..cbd5dd4 100644
--- a/cc/content_layer_unittest.cc
+++ b/cc/content_layer_unittest.cc
@@ -51,4 +51,4 @@ TEST(ContentLayerTest, ContentLayerPainterWithDeviceScale)
     EXPECT_RECT_EQ(gfx::ToEnclosingRect(opaqueRectInContentSpace), resultingOpaqueRect);
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/content_layer_updater.cc b/cc/content_layer_updater.cc
index 5ad5f85..b62a293 100644
--- a/cc/content_layer_updater.cc
+++ b/cc/content_layer_updater.cc
@@ -62,4 +62,4 @@ void ContentLayerUpdater::paintContents(SkCanvas* canvas, const gfx::Rect& conte
     m_contentRect = contentRect;
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/contents_scaling_layer_unittest.cc b/cc/contents_scaling_layer_unittest.cc
index e05d762..45fbfb5 100644
--- a/cc/contents_scaling_layer_unittest.cc
+++ b/cc/contents_scaling_layer_unittest.cc
@@ -11,6 +11,8 @@
 
 using namespace cc;
 
+namespace {
+
 class MockContentsScalingLayer : public ContentsScalingLayer {
  public:
   MockContentsScalingLayer()
@@ -74,3 +76,5 @@ TEST(ContentsScalingLayerTest, checkContentsScaleChangeTriggersNeedsDisplay) {
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 320, 240),
                        testLayer->lastNeedsDisplayRect());
 }
+
+}  // anonymous namespace
diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc
index 6c24c67..ef3aa12 100644
--- a/cc/damage_tracker_unittest.cc
+++ b/cc/damage_tracker_unittest.cc
@@ -1160,4 +1160,4 @@ TEST_F(DamageTrackerTest, verifyDamageAccumulatesUntilReset)
     EXPECT_TRUE(rootDamageRect.IsEmpty());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/delay_based_time_source_unittest.cc b/cc/delay_based_time_source_unittest.cc
index 60c9d45c..3e824d6 100644
--- a/cc/delay_based_time_source_unittest.cc
+++ b/cc/delay_based_time_source_unittest.cc
@@ -374,4 +374,4 @@ TEST(DelayBasedTimeSource, TestDeactivateAndReactivateAfterNextTickTime)
     EXPECT_EQ(13, thread.pendingDelayMs());
 }
 
-}
+}  // anonymous namespace
diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc
index b00ee19..1c04e33 100644
--- a/cc/delegated_renderer_layer_impl.cc
+++ b/cc/delegated_renderer_layer_impl.cc
@@ -182,4 +182,4 @@ const char* DelegatedRendererLayerImpl::layerTypeAsString() const
     return "DelegatedRendererLayer";
 }
 
-}
+}  // namespace cc
diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc
index 23df876..7aee4b0 100644
--- a/cc/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/delegated_renderer_layer_impl_unittest.cc
@@ -452,4 +452,4 @@ TEST_F(DelegatedRendererLayerImplTestSharedData, SharedData)
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, sharedState->quadTransform);
 }
 
-} // namespace
+}  // annonymous namespace
diff --git a/cc/direct_renderer.cc b/cc/direct_renderer.cc
index 4deec4d..ea891a9 100644
--- a/cc/direct_renderer.cc
+++ b/cc/direct_renderer.cc
@@ -236,4 +236,4 @@ GLenum DirectRenderer::renderPassTextureFormat(const RenderPass*)
     return GL_RGBA;
 }
 
-}
+}  // namespace cc
diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc
index ecd221c..b3fd553 100644
--- a/cc/draw_quad.cc
+++ b/cc/draw_quad.cc
@@ -97,4 +97,4 @@ void DrawQuad::setSharedQuadState(const SharedQuadState* sharedQuadState)
     m_sharedQuadStateId = sharedQuadState->id;
 }
 
-}
+}  // namespace cc
diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc
index 9b86791..2d7055e 100644
--- a/cc/draw_quad_unittest.cc
+++ b/cc/draw_quad_unittest.cc
@@ -310,4 +310,4 @@ TEST(DrawQuadTest, copyYUVVideoDrawQuad)
     EXPECT_EQ(vPlane.visibleSize, copyQuad->vPlane().visibleSize);
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/float_quad_unittest.cc b/cc/float_quad_unittest.cc
index ebcdc28..bfc1d6a 100644
--- a/cc/float_quad_unittest.cc
+++ b/cc/float_quad_unittest.cc
@@ -58,4 +58,4 @@ TEST(FloatQuadTest, IsRectilinearTest)
     }
 }
 
-} // empty namespace
+}  // anonymous namespace
diff --git a/cc/frame_rate_controller.cc b/cc/frame_rate_controller.cc
index 97e4a02e..614ad71 100644
--- a/cc/frame_rate_controller.cc
+++ b/cc/frame_rate_controller.cc
@@ -162,4 +162,4 @@ base::TimeTicks FrameRateController::nextTickTime()
     return base::TimeTicks();
 }
 
-}
+}  // namespace cc
diff --git a/cc/frame_rate_controller_unittest.cc b/cc/frame_rate_controller_unittest.cc
index 7becaa2..b639a1d 100644
--- a/cc/frame_rate_controller_unittest.cc
+++ b/cc/frame_rate_controller_unittest.cc
@@ -167,4 +167,4 @@ TEST(FrameRateControllerTest, TestFrameThrottling_Unthrottled)
     EXPECT_TRUE(client.vsyncTicked());
 }
 
-}
+}  // anonymous namespace
diff --git a/cc/frame_rate_counter.cc b/cc/frame_rate_counter.cc
index 46b51f4..585dee7 100644
--- a/cc/frame_rate_counter.cc
+++ b/cc/frame_rate_counter.cc
@@ -132,4 +132,3 @@ base::TimeTicks FrameRateCounter::timeStampOfRecentFrame(int n)
 }
 
 }  // namespace cc
-
diff --git a/cc/geometry_binding.cc b/cc/geometry_binding.cc
index 89fda43..6a76ccc 100644
--- a/cc/geometry_binding.cc
+++ b/cc/geometry_binding.cc
@@ -55,4 +55,4 @@ void GeometryBinding::prepareForDraw()
     GLC(m_context, m_context->enableVertexAttribArray(texCoordAttribLocation()));
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 59eacef..241bcfe 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -1631,4 +1631,4 @@ bool GLRenderer::isContextLost()
     return (m_context->getGraphicsResetStatusARB() != GL_NO_ERROR);
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index 8e808058..bb0e9c6 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -22,6 +22,8 @@ using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
+namespace {
+
 class FrameCountingMemoryAllocationSettingContext : public FakeWebGraphicsContext3D {
 public:
     FrameCountingMemoryAllocationSettingContext() : m_frame(0) { }
@@ -483,3 +485,5 @@ TEST(GLRendererTest2, visibilityChangeIsLastCall)
     renderer.setVisible(false);
     EXPECT_TRUE(lastCallWasSetVisiblity);
 }
+
+}  // anonymous namespace
diff --git a/cc/hash_pair_unittest.cc b/cc/hash_pair_unittest.cc
index eab1930..a3218ec 100644
--- a/cc/hash_pair_unittest.cc
+++ b/cc/hash_pair_unittest.cc
@@ -5,6 +5,8 @@
 #include "cc/hash_pair.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace {
+
 class HashPairTest : public testing::Test {
 };
 
@@ -58,3 +60,5 @@ TEST_F(HashPairTest, IntegerPairs) {
   INSERT_PAIR_TEST(Int64Int32Pair, 9, (1 << 29) + 378128932);
   INSERT_PAIR_TEST(Int64Int64Pair, 10, (1LL << 60) + 78931732321);
 }
+
+}  // anonymous namespace
diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc
index 2e46740..0a9d47e 100644
--- a/cc/heads_up_display_layer.cc
+++ b/cc/heads_up_display_layer.cc
@@ -72,4 +72,4 @@ void HeadsUpDisplayLayer::pushPropertiesTo(LayerImpl* layerImpl)
     hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
 }
 
-}
+}  // namespace cc
diff --git a/cc/heads_up_display_unittest.cc b/cc/heads_up_display_unittest.cc
index 2433983..f93adaef 100644
--- a/cc/heads_up_display_unittest.cc
+++ b/cc/heads_up_display_unittest.cc
@@ -110,4 +110,4 @@ TEST_F(HudWithRootLayerChange, runMultiThread)
     runTest(true);
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/image_layer.cc b/cc/image_layer.cc
index 224f938..5171799 100644
--- a/cc/image_layer.cc
+++ b/cc/image_layer.cc
@@ -164,4 +164,4 @@ float ImageLayer::contentsScaleY() const
     return static_cast<float>(m_bitmap.height()) / bounds().height();
 }
 
-}
+}  // namespace cc
diff --git a/cc/io_surface_layer.cc b/cc/io_surface_layer.cc
index a1f3bb8..38fbdf4 100644
--- a/cc/io_surface_layer.cc
+++ b/cc/io_surface_layer.cc
@@ -50,4 +50,4 @@ void IOSurfaceLayer::pushPropertiesTo(LayerImpl* layer)
     ioSurfaceLayer->setIOSurfaceProperties(m_ioSurfaceId, m_ioSurfaceSize);
 }
 
-}
+}  // namespace cc
diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc
index 8acf88b..28fb1bc 100644
--- a/cc/io_surface_layer_impl.cc
+++ b/cc/io_surface_layer_impl.cc
@@ -112,4 +112,4 @@ const char* IOSurfaceLayerImpl::layerTypeAsString() const
     return "IOSurfaceLayer";
 }
 
-}
+}  // namespace cc
diff --git a/cc/keyframed_animation_curve.cc b/cc/keyframed_animation_curve.cc
index 9339c94..daf2457 100644
--- a/cc/keyframed_animation_curve.cc
+++ b/cc/keyframed_animation_curve.cc
@@ -220,4 +220,4 @@ WebTransformationMatrix KeyframedTransformAnimationCurve::getValue(double t) con
     return m_keyframes[i+1]->value().blend(m_keyframes[i]->value(), progress);
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/keyframed_animation_curve_unittest.cc b/cc/keyframed_animation_curve_unittest.cc
index 9afceaf..2adfede 100644
--- a/cc/keyframed_animation_curve_unittest.cc
+++ b/cc/keyframed_animation_curve_unittest.cc
@@ -203,4 +203,4 @@ TEST(KeyframedAnimationCurveTest, CubicBezierTimingFunction)
     EXPECT_FLOAT_EQ(1, curve->getValue(1));
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/layer.cc b/cc/layer.cc
index 1377dec..c5bbbb2 100644
--- a/cc/layer.cc
+++ b/cc/layer.cc
@@ -844,4 +844,4 @@ void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped
     // Currently we don't use z-order to decide what to paint, so there's no need to actually sort Layers.
 }
 
-}
+}  // namespace cc
diff --git a/cc/layer_animation_controller_unittest.cc b/cc/layer_animation_controller_unittest.cc
index 5c9402a..70b4165 100644
--- a/cc/layer_animation_controller_unittest.cc
+++ b/cc/layer_animation_controller_unittest.cc
@@ -558,4 +558,4 @@ TEST(LayerAnimationControllerTest, ForceSyncWhenSynchronizedStartTimeNeeded)
     EXPECT_EQ(ActiveAnimation::WaitingForTargetAvailability, activeAnimation->runState());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index 54e45fad..4161311 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -705,4 +705,4 @@ void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer)
     m_scrollbarAnimationController->updateScrollOffset(this);
 }
 
-}
+}  // namespace cc
diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc
index b852078..7dbcc24 100644
--- a/cc/layer_impl_unittest.cc
+++ b/cc/layer_impl_unittest.cc
@@ -163,4 +163,4 @@ TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly)
     EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setBounds(arbitrarySize));
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/layer_iterator.cc b/cc/layer_iterator.cc
index aadb281..8dfa065 100644
--- a/cc/layer_iterator.cc
+++ b/cc/layer_iterator.cc
@@ -146,4 +146,4 @@ template CC_EXPORT void LayerIteratorActions::FrontToBack::end(LayerIterator<Lay
 template CC_EXPORT void LayerIteratorActions::FrontToBack::begin(LayerIterator<LayerImpl, LayerImplList, RenderSurfaceImpl, FrontToBack>&);
 template CC_EXPORT void LayerIteratorActions::FrontToBack::goToHighestInSubtree(LayerIterator<LayerImpl, LayerImplList, RenderSurfaceImpl, FrontToBack>&);
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/layer_iterator_unittest.cc b/cc/layer_iterator_unittest.cc
index 9d7051e..74e7a3e 100644
--- a/cc/layer_iterator_unittest.cc
+++ b/cc/layer_iterator_unittest.cc
@@ -252,4 +252,4 @@ TEST(LayerIteratorTest, complexTreeMultiSurface)
     EXPECT_COUNT(root3, -1, -1, 0);
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/layer_quad_unittest.cc b/cc/layer_quad_unittest.cc
index 23b0d09..9d7f78b 100644
--- a/cc/layer_quad_unittest.cc
+++ b/cc/layer_quad_unittest.cc
@@ -43,4 +43,4 @@ TEST(LayerQuadTest, Inflate)
     EXPECT_TRUE(layerQuad.ToQuadF() == quad);
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/layer_sorter.cc b/cc/layer_sorter.cc
index ca1e8b2..2e37425 100644
--- a/cc/layer_sorter.cc
+++ b/cc/layer_sorter.cc
@@ -413,4 +413,4 @@ void LayerSorter::sort(LayerList::iterator first, LayerList::iterator last)
     m_activeEdges.clear();
 }
 
-}
+}  // namespace cc
diff --git a/cc/layer_sorter_unittest.cc b/cc/layer_sorter_unittest.cc
index 4737c2e..856169b 100644
--- a/cc/layer_sorter_unittest.cc
+++ b/cc/layer_sorter_unittest.cc
@@ -264,4 +264,4 @@ TEST(LayerSorterTest, verifyExistingOrderingPreservedWhenNoZDiff)
     EXPECT_EQ(5, layerList[4]->id());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/layer_tiling_data.cc b/cc/layer_tiling_data.cc
index ccfa205..33b9877 100644
--- a/cc/layer_tiling_data.cc
+++ b/cc/layer_tiling_data.cc
@@ -148,4 +148,4 @@ gfx::Size LayerTilingData::bounds() const
     return m_tilingData.total_size();
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index f9eae12..9e5fcc5 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -839,4 +839,4 @@ void LayerTreeHost::setAnimationEventsRecursive(const AnimationEventsVector& eve
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/layer_tree_host_common.cc b/cc/layer_tree_host_common.cc
index a119b89..dd10225 100644
--- a/cc/layer_tree_host_common.cc
+++ b/cc/layer_tree_host_common.cc
@@ -930,4 +930,4 @@ LayerImpl* LayerTreeHostCommon::findLayerThatIsHitByPoint(const gfx::PointF& scr
     return foundLayer;
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc
index e18137a..d5521d0 100644
--- a/cc/layer_tree_host_common_unittest.cc
+++ b/cc/layer_tree_host_common_unittest.cc
@@ -4045,4 +4045,4 @@ TEST(LayerTreeHostCommonTest, verifySubtreeSearch)
     EXPECT_EQ(0, LayerTreeHostCommon::findLayerInSubtree(root.get(), nonexistentId));
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index f6c2bff..5126b46 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -4409,4 +4409,4 @@ INSTANTIATE_TEST_CASE_P(LayerTreeHostImplTests,
                         LayerTreeHostImplTest,
                         ::testing::Values(false, true));
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index 704158e..bbb2b22 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -3270,4 +3270,4 @@ TEST_F(LayerTreeHostTestDeferCommits, runMultiThread)
     runTest(true);
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
index aadf11e..d85a855 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layer_unittest.cc
@@ -799,4 +799,4 @@ TEST(LayerTestWithoutFixture, setBoundsTriggersSetNeedsRedrawAfterGettingNonEmpt
 }
 
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/layer_updater.cc b/cc/layer_updater.cc
index 2b01d125..33daa98 100644
--- a/cc/layer_updater.cc
+++ b/cc/layer_updater.cc
@@ -17,4 +17,4 @@ LayerUpdater::Resource::~Resource()
 {
 }
 
-}
+}  // namespace cc
diff --git a/cc/managed_memory_policy.cc b/cc/managed_memory_policy.cc
index afbd10f..1fcb16d 100644
--- a/cc/managed_memory_policy.cc
+++ b/cc/managed_memory_policy.cc
@@ -42,4 +42,4 @@ bool ManagedMemoryPolicy::operator!=(const ManagedMemoryPolicy& other) const
     return !(*this == other);
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/math_util.cc b/cc/math_util.cc
index 23fd588..6ae41e6 100644
--- a/cc/math_util.cc
+++ b/cc/math_util.cc
@@ -393,4 +393,4 @@ FloatSize MathUtil::projectVector(const FloatSize& source, const FloatSize& dest
     return FloatSize(projectedLength * destination.width(), projectedLength * destination.height());
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/math_util_unittest.cc b/cc/math_util_unittest.cc
index 0b3ddcd..e6270cf 100644
--- a/cc/math_util_unittest.cc
+++ b/cc/math_util_unittest.cc
@@ -181,4 +181,4 @@ TEST(MathUtilTest, vectorProjection)
               projectedVector.height() / targetVector.height());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc
index 5953cdd..c47d66a 100644
--- a/cc/occlusion_tracker_unittest.cc
+++ b/cc/occlusion_tracker_unittest.cc
@@ -3173,4 +3173,4 @@ protected:
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestMinimumTrackingSize);
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/overdraw_metrics.cc b/cc/overdraw_metrics.cc
index 9509bfa..be8e7f8 100644
--- a/cc/overdraw_metrics.cc
+++ b/cc/overdraw_metrics.cc
@@ -183,4 +183,4 @@ void OverdrawMetrics::recordMetricsInternal(MetricsType metricsType, const Layer
     }
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/prioritized_texture.cc b/cc/prioritized_texture.cc
index 70c0930..5121b7c 100644
--- a/cc/prioritized_texture.cc
+++ b/cc/prioritized_texture.cc
@@ -203,4 +203,4 @@ void PrioritizedTexture::returnBackingTexture()
         m_manager->returnBackingTexture(this);
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/prioritized_texture_manager.cc b/cc/prioritized_texture_manager.cc
index 32944bf..3c66903 100644
--- a/cc/prioritized_texture_manager.cc
+++ b/cc/prioritized_texture_manager.cc
@@ -472,4 +472,4 @@ void PrioritizedTextureManager::assertInvariants()
 #endif
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/prioritized_texture_unittest.cc b/cc/prioritized_texture_unittest.cc
index 6a26194..181fb86 100644
--- a/cc/prioritized_texture_unittest.cc
+++ b/cc/prioritized_texture_unittest.cc
@@ -702,4 +702,4 @@ TEST_F(PrioritizedTextureTest, usageStatistics)
 }
 
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/priority_calculator.cc b/cc/priority_calculator.cc
index 8993f88..e03229d 100644
--- a/cc/priority_calculator.cc
+++ b/cc/priority_calculator.cc
@@ -132,4 +132,4 @@ int PriorityCalculator::allowEverythingCutoff()
     return everythingPriorityCutoff;
 }
 
-} // cc
+}  // namespace cc
diff --git a/cc/program_binding.cc b/cc/program_binding.cc
index 65bff7a..4f51351 100644
--- a/cc/program_binding.cc
+++ b/cc/program_binding.cc
@@ -139,4 +139,4 @@ void ProgramBindingBase::cleanupShaders(WebGraphicsContext3D* context)
     }
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/proxy.cc b/cc/proxy.cc
index 7b738aa..a1b37f4 100644
--- a/cc/proxy.cc
+++ b/cc/proxy.cc
@@ -109,4 +109,4 @@ Proxy::~Proxy()
     DCHECK(isMainThread());
 }
 
-}
+}  // namespace cc
diff --git a/cc/quad_culler.cc b/cc/quad_culler.cc
index b3e4273..a149795 100644
--- a/cc/quad_culler.cc
+++ b/cc/quad_culler.cc
@@ -89,4 +89,4 @@ bool QuadCuller::append(scoped_ptr<DrawQuad> drawQuad, AppendQuadsData& appendQu
     return appendQuadInternal(drawQuad.Pass(), culledRect, m_quadList, *m_occlusionTracker, m_showCullingWithDebugBorderQuads);
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc
index a9f15bb..c60aec6 100644
--- a/cc/quad_culler_unittest.cc
+++ b/cc/quad_culler_unittest.cc
@@ -468,4 +468,4 @@ TEST(QuadCullerTest, verifyWithoutMetrics)
 }
 
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/rate_limiter.cc b/cc/rate_limiter.cc
index fab541e..9967a85 100644
--- a/cc/rate_limiter.cc
+++ b/cc/rate_limiter.cc
@@ -58,4 +58,4 @@ void RateLimiter::rateLimitContext()
     m_context->rateLimitOffscreenContextCHROMIUM();
 }
 
-}
+}  // namespace cc
diff --git a/cc/render_pass_unittest.cc b/cc/render_pass_unittest.cc
index 5c782e6..9f37e10b 100644
--- a/cc/render_pass_unittest.cc
+++ b/cc/render_pass_unittest.cc
@@ -84,4 +84,4 @@ TEST(RenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
     EXPECT_EQ(sizeof(RenderPassSize), sizeof(RenderPass));
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/render_surface.cc b/cc/render_surface.cc
index 3662800..ca8fd55 100644
--- a/cc/render_surface.cc
+++ b/cc/render_surface.cc
@@ -36,4 +36,4 @@ gfx::RectF RenderSurface::drawableContentRect() const
     return drawableContentRect;
 }
 
-}
+}  // namespace cc
diff --git a/cc/render_surface_filters_unittest.cc b/cc/render_surface_filters_unittest.cc
index 7523832..05a15c14 100644
--- a/cc/render_surface_filters_unittest.cc
+++ b/cc/render_surface_filters_unittest.cc
@@ -137,4 +137,4 @@ TEST(RenderSurfaceFiltersTest, testOptimize)
     EXPECT_EQ(3u, optimized.size());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc
index b1fe31e..0ed8ede 100644
--- a/cc/render_surface_impl.cc
+++ b/cc/render_surface_impl.cc
@@ -251,4 +251,4 @@ void RenderSurfaceImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQ
                                                  maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, maskTexCoordOffsetY).PassAs<DrawQuad>(), appendQuadsData);
 }
 
-}
+}  // namespace cc
diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc
index be35ac1..bdcaa99 100644
--- a/cc/render_surface_unittest.cc
+++ b/cc/render_surface_unittest.cc
@@ -162,4 +162,4 @@ TEST(RenderSurfaceTest, sanityCheckSurfaceCreatesCorrectRenderPass)
     EXPECT_EQ(origin, pass->transformToRootTarget());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/renderer.cc b/cc/renderer.cc
index 8ca4205..2dac708 100644
--- a/cc/renderer.cc
+++ b/cc/renderer.cc
@@ -18,4 +18,4 @@ bool Renderer::isContextLost()
     return false;
 }
 
-}
+}  // namespace cc
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index d742ec5..3522520 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -714,4 +714,4 @@ void ResourceProvider::debugNotifyLeaveZone()
 }
 
 
-}
+}  // namespace cc
diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc
index 2aca348..b07013f 100644
--- a/cc/resource_provider_unittest.cc
+++ b/cc/resource_provider_unittest.cc
@@ -592,4 +592,4 @@ INSTANTIATE_TEST_CASE_P(ResourceProviderTests,
                         ::testing::Values(ResourceProvider::GLTexture,
                                           ResourceProvider::Bitmap));
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc
index 9c46af5..083a697 100644
--- a/cc/resource_update_controller_unittest.cc
+++ b/cc/resource_update_controller_unittest.cc
@@ -477,4 +477,4 @@ TEST_F(ResourceUpdateControllerTest, UpdatesCompleteInFiniteTime)
     EXPECT_EQ(2, m_numTotalUploads);
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/resource_update_queue.cc b/cc/resource_update_queue.cc
index 26a24b3..e1cac2a 100644
--- a/cc/resource_update_queue.cc
+++ b/cc/resource_update_queue.cc
@@ -77,4 +77,4 @@ bool ResourceUpdateQueue::hasMoreUpdates() const
     return m_fullEntries.size() || m_partialEntries.size() || m_copyEntries.size();
 }
 
-}
+}  // namespace cc
diff --git a/cc/scheduler_state_machine.cc b/cc/scheduler_state_machine.cc
index 9eda037..c067f7b 100644
--- a/cc/scheduler_state_machine.cc
+++ b/cc/scheduler_state_machine.cc
@@ -316,4 +316,4 @@ void SchedulerStateMachine::setMaximumNumberOfFailedDrawsBeforeDrawIsForced(int
     m_maximumNumberOfFailedDrawsBeforeDrawIsForced = numDraws;
 }
 
-}
+}  // namespace cc
diff --git a/cc/scheduler_state_machine_unittest.cc b/cc/scheduler_state_machine_unittest.cc
index a5af78c..f392e85 100644
--- a/cc/scheduler_state_machine_unittest.cc
+++ b/cc/scheduler_state_machine_unittest.cc
@@ -870,4 +870,4 @@ TEST(SchedulerStateMachineTest, TestBeginFrameWhenContextLost)
     EXPECT_EQ(SchedulerStateMachine::ACTION_BEGIN_FRAME, state.nextAction());
 }
 
-}
+}  // anonymous namespace
diff --git a/cc/scheduler_unittest.cc b/cc/scheduler_unittest.cc
index 1e6b06b..10b166f 100644
--- a/cc/scheduler_unittest.cc
+++ b/cc/scheduler_unittest.cc
@@ -467,4 +467,4 @@ TEST(SchedulerTest, NoBeginFrameWhenSwapFailsDuringForcedCommit)
     EXPECT_EQ(0, controllerPtr->numFramesPending());
 }
 
-}
+}  // anonymous namespace
diff --git a/cc/scoped_texture.cc b/cc/scoped_texture.cc
index 5f40475..38fb797 100644
--- a/cc/scoped_texture.cc
+++ b/cc/scoped_texture.cc
@@ -50,4 +50,4 @@ void ScopedTexture::leak()
     setId(0);
 }
 
-}
+}  // namespace cc
diff --git a/cc/scoped_texture_unittest.cc b/cc/scoped_texture_unittest.cc
index 9e5a59e..29e5bb4 100644
--- a/cc/scoped_texture_unittest.cc
+++ b/cc/scoped_texture_unittest.cc
@@ -105,4 +105,4 @@ TEST(ScopedTextureTest, LeakScopedTexture)
     EXPECT_EQ(1u, resourceProvider->numResources());
 }
 
-}
+}  // anonymous namespace
diff --git a/cc/scoped_thread_proxy.cc b/cc/scoped_thread_proxy.cc
index 9391e3b..a5ad931 100644
--- a/cc/scoped_thread_proxy.cc
+++ b/cc/scoped_thread_proxy.cc
@@ -43,4 +43,4 @@ void ScopedThreadProxy::runTaskIfNotShutdown(base::Closure cb)
     cb.Run();
 }
 
-}
+}  // namespace cc
diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc
index 7335e2c..88c58e2 100644
--- a/cc/scrollbar_animation_controller.cc
+++ b/cc/scrollbar_animation_controller.cc
@@ -94,4 +94,4 @@ void ScrollbarAnimationController::updateScrollOffsetAtTime(LayerImpl* scrollLay
     }
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/scrollbar_animation_controller_linear_fade.cc b/cc/scrollbar_animation_controller_linear_fade.cc
index 6d721bf..c405f66 100644
--- a/cc/scrollbar_animation_controller_linear_fade.cc
+++ b/cc/scrollbar_animation_controller_linear_fade.cc
@@ -74,4 +74,4 @@ float ScrollbarAnimationControllerLinearFade::opacityAtTime(double monotonicTime
     return 0;
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/scrollbar_animation_controller_linear_fade_unittest.cc
index 32537cb..af7bee4 100644
--- a/cc/scrollbar_animation_controller_linear_fade_unittest.cc
+++ b/cc/scrollbar_animation_controller_linear_fade_unittest.cc
@@ -116,4 +116,4 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyForceAwakenByPinch)
 
 }
 
-}
+}  // annoymous namespace
diff --git a/cc/scrollbar_geometry_fixed_thumb.cc b/cc/scrollbar_geometry_fixed_thumb.cc
index cbf0adb4..9997011 100644
--- a/cc/scrollbar_geometry_fixed_thumb.cc
+++ b/cc/scrollbar_geometry_fixed_thumb.cc
@@ -91,4 +91,4 @@ ScrollbarGeometryFixedThumb::ScrollbarGeometryFixedThumb(scoped_ptr<WebScrollbar
 {
 }
 
-}
+}  // namespace cc
diff --git a/cc/scrollbar_geometry_stub.cc b/cc/scrollbar_geometry_stub.cc
index e5a5ed2..21fb8f3 100644
--- a/cc/scrollbar_geometry_stub.cc
+++ b/cc/scrollbar_geometry_stub.cc
@@ -106,4 +106,4 @@ void ScrollbarGeometryStub::splitTrack(WebScrollbar* scrollbar, const WebRect& u
     m_geometry->splitTrack(scrollbar, unconstrainedTrackRect, beforeThumbRect, thumbRect, afterThumbRect);
 }
 
-}
+}  // namespace cc
diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc
index cb648c8..0c19975 100644
--- a/cc/scrollbar_layer.cc
+++ b/cc/scrollbar_layer.cc
@@ -275,4 +275,4 @@ void ScrollbarLayer::update(ResourceUpdateQueue& queue, const OcclusionTracker*,
         updatePart(m_thumbUpdater.get(), m_thumb.get(), originThumbRect, queue, stats);
 }
 
-}
+}  // namespace cc
diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc
index 1fd0818..f0cfb914 100644
--- a/cc/scrollbar_layer_impl.cc
+++ b/cc/scrollbar_layer_impl.cc
@@ -207,4 +207,4 @@ const char* ScrollbarLayerImpl::layerTypeAsString() const
     return "ScrollbarLayer";
 }
 
-}
+}  // namespace cc
diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc
index fb68734..44ea2e8 100644
--- a/cc/scrollbar_layer_unittest.cc
+++ b/cc/scrollbar_layer_unittest.cc
@@ -128,4 +128,4 @@ TEST(ScrollbarLayerTest, scrollOffsetSynchronization)
     EXPECT_EQ(300, ccScrollbarLayer->maximum());
 }
 
-}
+}  // anonymous namespace
diff --git a/cc/settings.cc b/cc/settings.cc
index 3aa1326..443ebfe 100644
--- a/cc/settings.cc
+++ b/cc/settings.cc
@@ -109,4 +109,4 @@ void Settings::setPageScalePinchZoomEnabled(bool enabled)
     s_pageScalePinchZoomEnabled = enabled;
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/shader.cc b/cc/shader.cc
index 1f20567..4bed89e 100644
--- a/cc/shader.cc
+++ b/cc/shader.cc
@@ -882,4 +882,4 @@ std::string FragmentShaderCheckerboard::getShaderString() const
     );
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc
index 7fe679f..baa0f2a 100644
--- a/cc/single_thread_proxy.cc
+++ b/cc/single_thread_proxy.cc
@@ -397,4 +397,4 @@ void SingleThreadProxy::didSwapFrame()
     }
 }
 
-}
+}  // namespace cc
diff --git a/cc/skpicture_content_layer_updater.cc b/cc/skpicture_content_layer_updater.cc
index 0418941..7e049ec 100644
--- a/cc/skpicture_content_layer_updater.cc
+++ b/cc/skpicture_content_layer_updater.cc
@@ -76,4 +76,4 @@ void SkPictureContentLayerUpdater::setOpaque(bool opaque)
     m_layerIsOpaque = opaque;
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 9592039..6f96596 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -361,4 +361,4 @@ void SoftwareRenderer::setVisible(bool visible)
     m_visible = visible;
 }
 
-}
+}  // namespace cc
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc
index ca3f13d..8f977e0 100644
--- a/cc/software_renderer_unittest.cc
+++ b/cc/software_renderer_unittest.cc
@@ -152,4 +152,4 @@ TEST_F(SoftwareRendererTest, tileQuad)
     EXPECT_EQ(SK_ColorCYAN, pixels[outerPixels - outerSize.width() - 2]);
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/solid_color_layer.cc b/cc/solid_color_layer.cc
index e562c5ed..8f716cf 100644
--- a/cc/solid_color_layer.cc
+++ b/cc/solid_color_layer.cc
@@ -29,4 +29,4 @@ SolidColorLayer::~SolidColorLayer()
 {
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc
index 7321d68..e534601 100644
--- a/cc/solid_color_layer_impl_unittest.cc
+++ b/cc/solid_color_layer_impl_unittest.cc
@@ -90,4 +90,4 @@ TEST(SolidColorLayerImplTest, verifyCorrectOpacityInQuad)
     EXPECT_EQ(opacity, SolidColorDrawQuad::materialCast(quadCuller.quadList()[0])->opacity());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/texture.cc b/cc/texture.cc
index 0b75834..af74f31 100644
--- a/cc/texture.cc
+++ b/cc/texture.cc
@@ -46,4 +46,4 @@ size_t Texture::memorySizeBytes(const gfx::Size& size, GLenum format)
     return bytesPerPixel(format) * size.width() * size.height();
 }
 
-}
+}  // namespace cc
diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc
index 988e3c7d..5320c65 100644
--- a/cc/texture_copier.cc
+++ b/cc/texture_copier.cc
@@ -95,4 +95,4 @@ void AcceleratedTextureCopier::flush()
     GLC(m_context, m_context->flush());
 }
 
-}
+}  // namespace cc
diff --git a/cc/texture_copier_unittest.cc b/cc/texture_copier_unittest.cc
index 5552734..a689abb 100644
--- a/cc/texture_copier_unittest.cc
+++ b/cc/texture_copier_unittest.cc
@@ -17,6 +17,8 @@ using testing::InSequence;
 using testing::Test;
 using testing::_;
 
+namespace {
+
 class MockContext : public FakeWebGraphicsContext3D {
 public:
     MOCK_METHOD2(bindFramebuffer, void(WGC3Denum, WebGLId));
@@ -56,3 +58,5 @@ TEST(TextureCopierTest, testDrawArraysCopy)
     TextureCopier::Parameters copy = { sourceTextureId, destTextureId, size };
     copier->copyTexture(copy);
 }
+
+}  // anonymous namespace
diff --git a/cc/texture_draw_quad.cc b/cc/texture_draw_quad.cc
index 8536d0d..6a07450 100644
--- a/cc/texture_draw_quad.cc
+++ b/cc/texture_draw_quad.cc
@@ -35,4 +35,4 @@ const TextureDrawQuad* TextureDrawQuad::materialCast(const DrawQuad* quad)
     return static_cast<const TextureDrawQuad*>(quad);
 }
 
-}
+}  // namespace cc
diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc
index 80d87fe..14e848d 100644
--- a/cc/texture_layer.cc
+++ b/cc/texture_layer.cc
@@ -132,4 +132,4 @@ void TextureLayer::pushPropertiesTo(LayerImpl* layer)
     m_contentCommitted = drawsContent();
 }
 
-}
+}  // namespace cc
diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc
index ff5b33c..f5c0e88 100644
--- a/cc/texture_layer_impl.cc
+++ b/cc/texture_layer_impl.cc
@@ -77,4 +77,4 @@ const char* TextureLayerImpl::layerTypeAsString() const
     return "TextureLayer";
 }
 
-}
+}  // namespace cc
diff --git a/cc/texture_layer_unittest.cc b/cc/texture_layer_unittest.cc
index 184f0a8..f413f27 100644
--- a/cc/texture_layer_unittest.cc
+++ b/cc/texture_layer_unittest.cc
@@ -189,4 +189,4 @@ TEST_F(TextureLayerTest, syncImplWhenRemovingFromTree)
     Mock::VerifyAndClearExpectations(m_layerTreeHost.get());
 }
 
-} // anonymous namespace
+}  // anonymous namespace
diff --git a/cc/texture_uploader.cc b/cc/texture_uploader.cc
index 5603d62..28decb8 100644
--- a/cc/texture_uploader.cc
+++ b/cc/texture_uploader.cc
@@ -357,4 +357,4 @@ void TextureUploader::processQueries()
     }
 }
 
-}
+}  // namespace cc
diff --git a/cc/texture_uploader_unittest.cc b/cc/texture_uploader_unittest.cc
index c3c1a7e..97ef5ec 100644
--- a/cc/texture_uploader_unittest.cc
+++ b/cc/texture_uploader_unittest.cc
@@ -97,4 +97,4 @@ TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking)
     EXPECT_EQ(0, uploader->numBlockingUploads());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/thread_impl.cc b/cc/thread_impl.cc
index 6d68a4c..cb6b20b 100644
--- a/cc/thread_impl.cc
+++ b/cc/thread_impl.cc
@@ -42,4 +42,4 @@ ThreadImpl::ThreadImpl(scoped_refptr<base::MessageLoopProxy> thread)
 {
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/tile_draw_quad.cc b/cc/tile_draw_quad.cc
index b4b6b47..f1e187d 100644
--- a/cc/tile_draw_quad.cc
+++ b/cc/tile_draw_quad.cc
@@ -39,4 +39,4 @@ const TileDrawQuad* TileDrawQuad::materialCast(const DrawQuad* quad)
     return static_cast<const TileDrawQuad*>(quad);
 }
 
-}
+}  // namespace cc
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index 74d1402..4d4a355 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -783,4 +783,4 @@ gfx::Rect TiledLayer::idlePaintRect()
     return prepaintRect;
 }
 
-}
+}  // namespace cc
diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
index cb9261a..b7fe7b8 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/tiled_layer_impl.cc
@@ -252,4 +252,4 @@ const char* TiledLayerImpl::layerTypeAsString() const
     return "ContentLayer";
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc
index 35c4962..a93bb6d 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/tiled_layer_impl_unittest.cc
@@ -241,4 +241,4 @@ TEST(TiledLayerImplTest, tileOpaqueRectForLayerNoBorders)
     }
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index 377e607..e0942f2 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -1627,4 +1627,4 @@ TEST_F(TiledLayerTest, nonIntegerContentsScaleIsNotDistortedDuringInvalidation)
     EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/timing_function.cc b/cc/timing_function.cc
index d6f647f..6588d36 100644
--- a/cc/timing_function.cc
+++ b/cc/timing_function.cc
@@ -71,4 +71,4 @@ scoped_ptr<TimingFunction> EaseInOutTimingFunction::create()
     return CubicBezierTimingFunction::create(0.42, 0, 0.58, 1).PassAs<TimingFunction>();
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/tree_synchronizer.cc b/cc/tree_synchronizer.cc
index 99eb727..ca4f2bb 100644
--- a/cc/tree_synchronizer.cc
+++ b/cc/tree_synchronizer.cc
@@ -109,4 +109,4 @@ void TreeSynchronizer::updateScrollbarLayerPointersRecursive(const RawPtrLayerIm
         scrollLayerImpl->setVerticalScrollbarLayer(scrollbarLayerImpl);
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc
index 88654df..7741967 100644
--- a/cc/tree_synchronizer_unittest.cc
+++ b/cc/tree_synchronizer_unittest.cc
@@ -403,4 +403,4 @@ TEST(TreeSynchronizerTest, synchronizeAnimations)
     EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerAnimationController())->synchronizedAnimations());
 }
 
-} // namespace
+}  // anonymous namespace
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc
index 54609e1..0c94817 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/video_layer_impl.cc
@@ -430,4 +430,4 @@ const char* VideoLayerImpl::layerTypeAsString() const
     return "VideoLayer";
 }
 
-}
+}  // namespace cc
diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
index 58794b5..7da1383 100644
--- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
+++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
@@ -110,4 +110,4 @@ void WebToCCInputHandlerAdapter::animate(base::TimeTicks time)
     m_handler->animate(monotonicTimeSeconds);
 }
 
-}
+}  // namespace WebKit