Fix cpplint errors in cc/(animation|input|layers|trees|test)/

This fixes lint errors in everything except for the few stragglers (occlusion unit test, etc) that haven't been chromified.

BUG=144577


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

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

51 files changed, 107 insertions, 66 deletions

diff --git a/cc/layers/append_quads_data.h b/cc/layers/append_quads_data.h
index 8583711..1ec8184 100644
--- a/cc/layers/append_quads_data.h
+++ b/cc/layers/append_quads_data.h
@@ -33,5 +33,5 @@ struct AppendQuadsData {
   const RenderPass::Id render_pass_id;
 };
 
-}
+}  // namespace cc
 #endif  // CC_LAYERS_APPEND_QUADS_DATA_H_
diff --git a/cc/layers/content_layer.h b/cc/layers/content_layer.h
index d59b56c..79394de 100644
--- a/cc/layers/content_layer.h
+++ b/cc/layers/content_layer.h
@@ -68,5 +68,5 @@ class CC_EXPORT ContentLayer : public TiledLayer {
   DISALLOW_COPY_AND_ASSIGN(ContentLayer);
 };
 
-}
+}  // namespace cc
 #endif  // CC_LAYERS_CONTENT_LAYER_H_
diff --git a/cc/layers/content_layer_client.h b/cc/layers/content_layer_client.h
index 1fdf024..e59c1d8 100644
--- a/cc/layers/content_layer_client.h
+++ b/cc/layers/content_layer_client.h
@@ -30,6 +30,6 @@ class CC_EXPORT ContentLayerClient {
   virtual ~ContentLayerClient() {}
 };
 
-}
+}  // namespace cc
 
 #endif  // CC_LAYERS_CONTENT_LAYER_CLIENT_H_
diff --git a/cc/layers/content_layer_unittest.cc b/cc/layers/content_layer_unittest.cc
index ab09d81..25421e7 100644
--- a/cc/layers/content_layer_unittest.cc
+++ b/cc/layers/content_layer_unittest.cc
@@ -11,8 +11,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect_conversions.h"
 
-using namespace WebKit;
-
 namespace cc {
 namespace {
 
diff --git a/cc/layers/contents_scaling_layer_unittest.cc b/cc/layers/contents_scaling_layer_unittest.cc
index 7029ffe..2010922 100644
--- a/cc/layers/contents_scaling_layer_unittest.cc
+++ b/cc/layers/contents_scaling_layer_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/contents_scaling_layer.h"
 
+#include <vector>
+
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/layers/delegated_renderer_layer.h b/cc/layers/delegated_renderer_layer.h
index a789317..a65855d 100644
--- a/cc/layers/delegated_renderer_layer.h
+++ b/cc/layers/delegated_renderer_layer.h
@@ -45,5 +45,5 @@ class CC_EXPORT DelegatedRendererLayer : public Layer {
   TransferableResourceArray unused_resources_for_child_compositor_;
 };
 
-}
+}  // namespace cc
 #endif  // CC_LAYERS_DELEGATED_RENDERER_LAYER_H_
diff --git a/cc/layers/delegated_renderer_layer_impl.cc b/cc/layers/delegated_renderer_layer_impl.cc
index e83f9c3..9ae9e33 100644
--- a/cc/layers/delegated_renderer_layer_impl.cc
+++ b/cc/layers/delegated_renderer_layer_impl.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/delegated_renderer_layer_impl.h"
 
+#include <algorithm>
+#include <utility>
+
 #include "base/bind.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/append_quads_data.h"
@@ -51,7 +54,7 @@ static ResourceProvider::ResourceId ResourceRemapHelper(
     return 0;
   }
 
-  DCHECK(it->first == id);
+  DCHECK_EQ(it->first, id);
   ResourceProvider::ResourceId remapped_id = it->second;
   remapped_resources->insert(remapped_id);
   return remapped_id;
@@ -160,7 +163,8 @@ void DelegatedRendererLayerImpl::ClearRenderPasses() {
 
 scoped_ptr<LayerImpl> DelegatedRendererLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
-  return DelegatedRendererLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
+  return DelegatedRendererLayerImpl::Create(
+      tree_impl, id()).PassAs<LayerImpl>();
 }
 
 void DelegatedRendererLayerImpl::DidLoseOutputSurface() {
@@ -210,7 +214,7 @@ void DelegatedRendererLayerImpl::AppendContributingRenderPasses(
         ConvertDelegatedRenderPassId(render_passes_in_draw_order_[i]->id);
 
     // Don't clash with the RenderPass we generate if we own a RenderSurface.
-    DCHECK(output_render_pass_id.index > 0);
+    DCHECK_GT(output_render_pass_id.index, 0);
 
     render_pass_sink->AppendRenderPass(
         render_passes_in_draw_order_[i]->Copy(output_render_pass_id));
diff --git a/cc/layers/delegated_renderer_layer_impl.h b/cc/layers/delegated_renderer_layer_impl.h
index d768ea6..b5e2467 100644
--- a/cc/layers/delegated_renderer_layer_impl.h
+++ b/cc/layers/delegated_renderer_layer_impl.h
@@ -22,7 +22,8 @@ class CC_EXPORT DelegatedRendererLayerImpl : public LayerImpl {
   virtual ~DelegatedRendererLayerImpl();
 
   // LayerImpl overrides.
-  virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl*) OVERRIDE;
+  virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
+      OVERRIDE;
   virtual bool HasDelegatedContent() const OVERRIDE;
   virtual bool HasContributingDelegatedRenderPasses() const OVERRIDE;
   virtual RenderPass::Id FirstContributingRenderPassId() const OVERRIDE;
@@ -87,6 +88,6 @@ class CC_EXPORT DelegatedRendererLayerImpl : public LayerImpl {
   int child_id_;
 };
 
-}
+}  // namespace cc
 
 #endif  // CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index 23207be..bdff25f 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -94,20 +94,20 @@ class DelegatedRendererLayerImplTestSimple
 
     ScopedPtrVector<RenderPass> delegated_render_passes;
     TestRenderPass* pass1 = AddRenderPass(
-        delegated_render_passes,
+        &delegated_render_passes,
         RenderPass::Id(9, 6),
         gfx::Rect(6, 6, 6, 6),
         gfx::Transform());
     AddQuad(pass1, gfx::Rect(0, 0, 6, 6), 33u);
     TestRenderPass* pass2 = AddRenderPass(
-        delegated_render_passes,
+        &delegated_render_passes,
         RenderPass::Id(9, 7),
         gfx::Rect(7, 7, 7, 7),
         gfx::Transform());
     AddQuad(pass2, gfx::Rect(0, 0, 7, 7), 22u);
     AddRenderPassQuad(pass2, pass1);
     TestRenderPass* pass3 = AddRenderPass(
-        delegated_render_passes,
+        &delegated_render_passes,
         RenderPass::Id(9, 8),
         gfx::Rect(0, 0, 8, 8),
         gfx::Transform());
@@ -470,7 +470,7 @@ class DelegatedRendererLayerImplTestTransform
     root_layer->SetBounds(gfx::Size(100, 100));
 
     delegated_renderer_layer->SetPosition(gfx::Point(20, 20));
-    delegated_renderer_layer->SetBounds(gfx::Size(30, 30)); 
+    delegated_renderer_layer->SetBounds(gfx::Size(30, 30));
     delegated_renderer_layer->SetContentBounds(gfx::Size(30, 30));
     delegated_renderer_layer->SetDrawsContent(true);
     gfx::Transform transform;
@@ -490,7 +490,7 @@ class DelegatedRendererLayerImplTestTransform
 
     {
       TestRenderPass* pass = AddRenderPass(
-          delegated_render_passes,
+          &delegated_render_passes,
           RenderPass::Id(10, 7),
           child_pass_rect,
           gfx::Transform());
@@ -525,7 +525,7 @@ class DelegatedRendererLayerImplTestTransform
     bool root_pass_clipped = root_delegated_render_pass_is_clipped_;
 
     TestRenderPass* pass = AddRenderPass(
-        delegated_render_passes,
+        &delegated_render_passes,
         RenderPass::Id(9, 6),
         root_pass_rect,
         gfx::Transform());
@@ -887,7 +887,7 @@ class DelegatedRendererLayerImplTestClip
 
     {
       TestRenderPass* pass = AddRenderPass(
-          delegated_render_passes,
+          &delegated_render_passes,
           RenderPass::Id(10, 7),
           child_pass_rect,
           gfx::Transform());
@@ -920,7 +920,7 @@ class DelegatedRendererLayerImplTestClip
     bool root_pass_clipped = root_delegated_render_pass_is_clipped_;
 
     TestRenderPass* pass = AddRenderPass(
-        delegated_render_passes,
+        &delegated_render_passes,
         RenderPass::Id(9, 6),
         root_pass_rect,
         gfx::Transform());
diff --git a/cc/layers/heads_up_display_layer.cc b/cc/layers/heads_up_display_layer.cc
index f2d46ed..76016b5 100644
--- a/cc/layers/heads_up_display_layer.cc
+++ b/cc/layers/heads_up_display_layer.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/heads_up_display_layer.h"
 
+#include <algorithm>
+
 #include "base/debug/trace_event.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/trees/layer_tree_host.h"
diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc
index 4706f34..270e04d 100644
--- a/cc/layers/heads_up_display_layer_impl.cc
+++ b/cc/layers/heads_up_display_layer_impl.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/heads_up_display_layer_impl.h"
 
+#include <algorithm>
+#include <vector>
+
 #include "base/stringprintf.h"
 #include "base/strings/string_split.h"
 #include "cc/debug/debug_colors.h"
@@ -17,7 +20,6 @@
 #include "cc/resources/tile_manager.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "skia/ext/platform_canvas.h"
-#include "skia/ext/platform_canvas.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/cc/layers/heads_up_display_layer_impl.h b/cc/layers/heads_up_display_layer_impl.h
index 3bc3cf2..0940dea 100644
--- a/cc/layers/heads_up_display_layer_impl.h
+++ b/cc/layers/heads_up_display_layer_impl.h
@@ -5,6 +5,8 @@
 #ifndef CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
 #define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
 
+#include <string>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/base/cc_export.h"
diff --git a/cc/layers/io_surface_layer.h b/cc/layers/io_surface_layer.h
index 4073a0d..67d8e21 100644
--- a/cc/layers/io_surface_layer.h
+++ b/cc/layers/io_surface_layer.h
@@ -31,5 +31,5 @@ class CC_EXPORT IOSurfaceLayer : public Layer {
   gfx::Size io_surface_size_;
 };
 
-}
+}  // namespace cc
 #endif  // CC_LAYERS_IO_SURFACE_LAYER_H_
diff --git a/cc/layers/io_surface_layer_impl.h b/cc/layers/io_surface_layer_impl.h
index 2c04ddd..1f40215 100644
--- a/cc/layers/io_surface_layer_impl.h
+++ b/cc/layers/io_surface_layer_impl.h
@@ -5,6 +5,8 @@
 #ifndef CC_LAYERS_IO_SURFACE_LAYER_IMPL_H_
 #define CC_LAYERS_IO_SURFACE_LAYER_IMPL_H_
 
+#include <string>
+
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 #include "ui/gfx/size.h"
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index e72e7b1..bdd2a4f 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/layer.h"
 
+#include <algorithm>
+
 #include "base/metrics/histogram.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_events.h"
@@ -106,7 +108,6 @@ void Layer::SetLayerTreeHost(LayerTreeHost* host) {
   if (host &&
       (!filters_.isEmpty() || !background_filters_.isEmpty() || filter_))
     layer_tree_host_->set_needs_filter_context();
-
 }
 
 void Layer::SetNeedsCommit() {
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 2ed7656..da5ca13 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -57,7 +57,7 @@ LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id)
 #endif
       horizontal_scrollbar_layer_(NULL),
       vertical_scrollbar_layer_(NULL) {
-  DCHECK(layer_id_ > 0);
+  DCHECK_GT(layer_id_, 0);
   DCHECK(layer_tree_impl_);
   layer_tree_impl_->RegisterLayer(this);
   AnimationRegistrar* registrar = layer_tree_impl_->animationRegistrar();
@@ -935,7 +935,6 @@ void LayerImpl::DidBecomeActive() {
   } else {
     scrollbar_animation_controller_.reset();
   }
-
 }
 void LayerImpl::SetHorizontalScrollbarLayer(
     ScrollbarLayerImpl* scrollbar_layer) {
@@ -961,7 +960,6 @@ void LayerImpl::AsValueInto(base::DictionaryValue* dict) const {
       gfx::QuadF(gfx::Rect(content_bounds())),
       &clipped);
   dict->Set("layer_quad", MathUtil::AsValue(layer_quad).release());
-
 }
 
 scoped_ptr<base::Value> LayerImpl::AsValue() const {
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index f33e644..2bee592 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -242,7 +242,7 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver {
     return draw_properties_.render_target;
   }
   RenderSurfaceImpl* render_surface() const {
- return draw_properties_.render_surface.get();
+    return draw_properties_.render_surface.get();
   }
 
   // The client should be responsible for setting bounds, content bounds and
@@ -523,6 +523,6 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver {
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
-}
+}  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_
diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
index cb65d76..5bbf4e2 100644
--- a/cc/layers/layer_impl_unittest.cc
+++ b/cc/layers/layer_impl_unittest.cc
@@ -15,7 +15,8 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 
-using namespace WebKit;
+using WebKit::WebFilterOperation;
+using WebKit::WebFilterOperations;
 
 namespace cc {
 namespace {
diff --git a/cc/layers/layer_iterator.cc b/cc/layers/layer_iterator.cc
index 5891168..39e4c2c 100644
--- a/cc/layers/layer_iterator.cc
+++ b/cc/layers/layer_iterator.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/layer_iterator.h"
 
+#include <vector>
+
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/render_surface.h"
diff --git a/cc/layers/layer_iterator.h b/cc/layers/layer_iterator.h
index 3e00a63..bd1d63b 100644
--- a/cc/layers/layer_iterator.h
+++ b/cc/layers/layer_iterator.h
@@ -84,7 +84,7 @@ namespace cc {
 // is representing, and you can query the iterator to decide
 // what actions to perform with the layer given what it represents.
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 
 // Non-templated constants
 struct LayerIteratorValue {
diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
index bc3f81e..cb2b5b1 100644
--- a/cc/layers/layer_iterator_unittest.cc
+++ b/cc/layers/layer_iterator_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/layer_iterator.h"
 
+#include <vector>
+
 #include "cc/layers/layer.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -158,7 +160,6 @@ TEST(LayerIteratorTest, SimpleTree) {
   EXPECT_COUNT(second, -1, -1, 2);
   EXPECT_COUNT(third, -1, -1, 1);
   EXPECT_COUNT(fourth, -1, -1, 0);
-
 }
 
 TEST(LayerIteratorTest, ComplexTree) {
@@ -213,7 +214,6 @@ TEST(LayerIteratorTest, ComplexTree) {
   EXPECT_COUNT(root23, -1, -1, 2);
   EXPECT_COUNT(root231, -1, -1, 1);
   EXPECT_COUNT(root3, -1, -1, 0);
-
 }
 
 TEST(LayerIteratorTest, ComplexTreeMultiSurface) {
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 4184e0b..da4283f 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -44,7 +44,7 @@ namespace {
 
 class MockLayerTreeHost : public LayerTreeHost {
  public:
-  MockLayerTreeHost(LayerTreeHostClient* client)
+  explicit MockLayerTreeHost(LayerTreeHostClient* client)
       : LayerTreeHost(client, LayerTreeSettings()) {
     Initialize(scoped_ptr<Thread>(NULL));
   }
diff --git a/cc/layers/nine_patch_layer.cc b/cc/layers/nine_patch_layer.cc
index f66fb49..45c69eb 100644
--- a/cc/layers/nine_patch_layer.cc
+++ b/cc/layers/nine_patch_layer.cc
@@ -113,4 +113,4 @@ void NinePatchLayer::PushPropertiesTo(LayerImpl* layer) {
   }
 }
 
-}
+}  // namespace cc
diff --git a/cc/layers/nine_patch_layer_impl.cc b/cc/layers/nine_patch_layer_impl.cc
index 69432bf..f41b550 100644
--- a/cc/layers/nine_patch_layer_impl.cc
+++ b/cc/layers/nine_patch_layer_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "nine_patch_layer_impl.h"
+#include "cc/layers/nine_patch_layer_impl.h"
 
 #include "base/stringprintf.h"
 #include "base/values.h"
diff --git a/cc/layers/nine_patch_layer_impl.h b/cc/layers/nine_patch_layer_impl.h
index ff89ac1c..d87f785 100644
--- a/cc/layers/nine_patch_layer_impl.h
+++ b/cc/layers/nine_patch_layer_impl.h
@@ -5,6 +5,8 @@
 #ifndef CC_LAYERS_NINE_PATCH_LAYER_IMPL_H_
 #define CC_LAYERS_NINE_PATCH_LAYER_IMPL_H_
 
+#include <string>
+
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/resources/resource_provider.h"
diff --git a/cc/layers/nine_patch_layer_unittest.cc b/cc/layers/nine_patch_layer_unittest.cc
index 2fcd2af..a274100 100644
--- a/cc/layers/nine_patch_layer_unittest.cc
+++ b/cc/layers/nine_patch_layer_unittest.cc
@@ -30,7 +30,7 @@ namespace {
 
 class MockLayerTreeHost : public LayerTreeHost {
  public:
-  MockLayerTreeHost(LayerTreeHostClient* client)
+  explicit MockLayerTreeHost(LayerTreeHostClient* client)
       : LayerTreeHost(client, LayerTreeSettings()) {
     Initialize(scoped_ptr<Thread>(NULL));
   }
diff --git a/cc/layers/picture_image_layer_impl.cc b/cc/layers/picture_image_layer_impl.cc
index 5c18d01..7cf7268 100644
--- a/cc/layers/picture_image_layer_impl.cc
+++ b/cc/layers/picture_image_layer_impl.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/picture_image_layer_impl.h"
 
+#include <algorithm>
+
 #include "cc/debug/debug_colors.h"
 #include "cc/trees/layer_tree_impl.h"
 
diff --git a/cc/layers/picture_image_layer_impl.h b/cc/layers/picture_image_layer_impl.h
index 943981e..4a2db50 100644
--- a/cc/layers/picture_image_layer_impl.h
+++ b/cc/layers/picture_image_layer_impl.h
@@ -36,6 +36,6 @@ class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
   DISALLOW_COPY_AND_ASSIGN(PictureImageLayerImpl);
 };
 
-}
+}  // namespace cc
 
 #endif  // CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
index 2ae8255..c6f341a 100644
--- a/cc/layers/picture_layer.cc
+++ b/cc/layers/picture_layer.cc
@@ -15,11 +15,11 @@ scoped_refptr<PictureLayer> PictureLayer::Create(ContentLayerClient* client) {
   return make_scoped_refptr(new PictureLayer(client));
 }
 
-PictureLayer::PictureLayer(ContentLayerClient* client) :
-  client_(client),
-  pile_(make_scoped_refptr(new PicturePile())),
-  instrumentation_object_tracker_(id()),
-  is_mask_(false) {
+PictureLayer::PictureLayer(ContentLayerClient* client)
+  : client_(client),
+    pile_(make_scoped_refptr(new PicturePile())),
+    instrumentation_object_tracker_(id()),
+    is_mask_(false) {
 }
 
 PictureLayer::~PictureLayer() {
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 8e0d06f..9d456fc 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/picture_layer_impl.h"
 
+#include <algorithm>
+
 #include "base/time.h"
 #include "cc/base/math_util.h"
 #include "cc/base/util.h"
@@ -154,7 +156,6 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
                                             ideal_contents_scale_);
        iter;
        ++iter) {
-
     gfx::Rect geometry_rect = iter.geometry_rect();
     if (!*iter || !iter->drawing_info().IsReadyToDraw()) {
       if (DrawCheckerboardForMissingTiles()) {
@@ -207,7 +208,7 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
       case ManagedTileState::DrawingInfo::TRANSPARENT_MODE:
         break;
       case ManagedTileState::DrawingInfo::PICTURE_PILE_MODE:
-        // TODO: crbug.com/173011 would fill this part in.
+        // TODO(leandrogarcia): crbug.com/173011 would fill this part in.
       default:
         NOTREACHED();
     }
@@ -576,8 +577,8 @@ void PictureLayerImpl::RemoveTiling(float contents_scale) {
 namespace {
 
 inline float PositiveRatio(float float1, float float2) {
-  DCHECK(float1 > 0);
-  DCHECK(float2 > 0);
+  DCHECK_GT(float1, 0);
+  DCHECK_GT(float2, 0);
   return float1 > float2 ? float1 / float2 : float2 / float1;
 }
 
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index c94d275..672acf7 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -5,6 +5,9 @@
 #ifndef CC_LAYERS_PICTURE_LAYER_IMPL_H_
 #define CC_LAYERS_PICTURE_LAYER_IMPL_H_
 
+#include <string>
+#include <vector>
+
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/layer_impl.h"
@@ -120,6 +123,6 @@ class CC_EXPORT PictureLayerImpl
   DISALLOW_COPY_AND_ASSIGN(PictureLayerImpl);
 };
 
-}
+}  // namespace cc
 
 #endif  // CC_LAYERS_PICTURE_LAYER_IMPL_H_
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 1d50b25..962d927 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/picture_layer_impl.h"
 
+#include <utility>
+
 #include "cc/layers/picture_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_impl_proxy.h"
diff --git a/cc/layers/render_surface.h b/cc/layers/render_surface.h
index 4373e34..5e29889 100644
--- a/cc/layers/render_surface.h
+++ b/cc/layers/render_surface.h
@@ -68,7 +68,7 @@ class CC_EXPORT RenderSurface {
 
   void SetTargetSurfaceTransformsAreAnimating(bool animating) {
     target_surface_transforms_are_animating_ = animating;
- }
+  }
   bool target_surface_transforms_are_animating() const {
     return target_surface_transforms_are_animating_;
   }
@@ -135,5 +135,5 @@ class CC_EXPORT RenderSurface {
   DISALLOW_COPY_AND_ASSIGN(RenderSurface);
 };
 
-}
+}  // namespace cc
 #endif  // CC_LAYERS_RENDER_SURFACE_H_
diff --git a/cc/layers/render_surface_impl.h b/cc/layers/render_surface_impl.h
index 1466bca..5154561 100644
--- a/cc/layers/render_surface_impl.h
+++ b/cc/layers/render_surface_impl.h
@@ -5,6 +5,9 @@
 #ifndef CC_LAYERS_RENDER_SURFACE_IMPL_H_
 #define CC_LAYERS_RENDER_SURFACE_IMPL_H_
 
+#include <string>
+#include <vector>
+
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
@@ -167,5 +170,5 @@ class CC_EXPORT RenderSurfaceImpl {
   DISALLOW_COPY_AND_ASSIGN(RenderSurfaceImpl);
 };
 
-}
+}  // namespace cc
 #endif  // CC_LAYERS_RENDER_SURFACE_IMPL_H_
diff --git a/cc/layers/scrollbar_geometry_fixed_thumb.h b/cc/layers/scrollbar_geometry_fixed_thumb.h
index 983a70c..74135d3 100644
--- a/cc/layers/scrollbar_geometry_fixed_thumb.h
+++ b/cc/layers/scrollbar_geometry_fixed_thumb.h
@@ -40,6 +40,6 @@ class CC_EXPORT ScrollbarGeometryFixedThumb : public ScrollbarGeometryStub {
   gfx::Size thumb_size_;
 };
 
-}
+}  // namespace cc
 
 #endif  // CC_LAYERS_SCROLLBAR_GEOMETRY_FIXED_THUMB_H_
diff --git a/cc/layers/scrollbar_geometry_stub.cc b/cc/layers/scrollbar_geometry_stub.cc
index cd2bc07..56682e0 100644
--- a/cc/layers/scrollbar_geometry_stub.cc
+++ b/cc/layers/scrollbar_geometry_stub.cc
@@ -4,7 +4,7 @@
 
 #include "cc/layers/scrollbar_geometry_stub.h"
 
-#include <cmath>
+#include <algorithm>
 
 namespace cc {
 
diff --git a/cc/layers/scrollbar_geometry_stub.h b/cc/layers/scrollbar_geometry_stub.h
index 7858f9c..04400e7 100644
--- a/cc/layers/scrollbar_geometry_stub.h
+++ b/cc/layers/scrollbar_geometry_stub.h
@@ -14,8 +14,8 @@ namespace cc {
 // This subclass wraps an existing scrollbar geometry class so that
 // another class can derive from it and override specific functions, while
 // passing through the remaining ones.
-class CC_EXPORT ScrollbarGeometryStub :
-    public NON_EXPORTED_BASE(WebKit::WebScrollbarThemeGeometry) {
+class CC_EXPORT ScrollbarGeometryStub
+    : public NON_EXPORTED_BASE(WebKit::WebScrollbarThemeGeometry) {
  public:
   virtual ~ScrollbarGeometryStub();
 
@@ -61,6 +61,6 @@ class CC_EXPORT ScrollbarGeometryStub :
   DISALLOW_COPY_AND_ASSIGN(ScrollbarGeometryStub);
 };
 
-}
+}  // namespace cc
 
 #endif  // CC_LAYERS_SCROLLBAR_GEOMETRY_STUB_H_
diff --git a/cc/layers/scrollbar_layer.cc b/cc/layers/scrollbar_layer.cc
index d251d62..c5f15b7 100644
--- a/cc/layers/scrollbar_layer.cc
+++ b/cc/layers/scrollbar_layer.cc
@@ -193,6 +193,7 @@ class ScrollbarBackgroundPainter : public LayerPainter {
 
     painter_->PaintTickmarks(canvas, track_paint_rect);
   }
+
  private:
   ScrollbarBackgroundPainter(WebKit::WebScrollbar* scrollbar,
                              ScrollbarThemePainter *painter,
diff --git a/cc/layers/scrollbar_layer_impl.h b/cc/layers/scrollbar_layer_impl.h
index 23422b3..7cf405b 100644
--- a/cc/layers/scrollbar_layer_impl.h
+++ b/cc/layers/scrollbar_layer_impl.h
@@ -100,7 +100,6 @@ class CC_EXPORT ScrollbarLayerImpl : public ScrollbarLayerImplBase {
 
    private:
     ScrollbarLayerImpl* owner_;
-
   };
 
   virtual const char* LayerTypeAsString() const OVERRIDE;
@@ -146,5 +145,5 @@ class CC_EXPORT ScrollbarLayerImpl : public ScrollbarLayerImplBase {
   bool is_overlay_scrollbar_;
 };
 
-}
+}  // namespace cc
 #endif  // CC_LAYERS_SCROLLBAR_LAYER_IMPL_H_
diff --git a/cc/layers/scrollbar_layer_impl_base.h b/cc/layers/scrollbar_layer_impl_base.h
index 714c0d7..5257c041 100644
--- a/cc/layers/scrollbar_layer_impl_base.h
+++ b/cc/layers/scrollbar_layer_impl_base.h
@@ -25,6 +25,6 @@ class CC_EXPORT ScrollbarLayerImplBase : public LayerImpl {
       : LayerImpl(tree_impl, id) {}
 };
 
-} // namespace cc
+}  // namespace cc
 
-#endif // CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_
+#endif  // CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_
diff --git a/cc/layers/solid_color_layer.h b/cc/layers/solid_color_layer.h
index 475f3ed..ae5a592 100644
--- a/cc/layers/solid_color_layer.h
+++ b/cc/layers/solid_color_layer.h
@@ -29,5 +29,5 @@ class CC_EXPORT SolidColorLayer : public Layer {
   virtual ~SolidColorLayer();
 };
 
-}
+}  // namespace cc
 #endif  // CC_LAYERS_SOLID_COLOR_LAYER_H_
diff --git a/cc/layers/solid_color_layer_impl.cc b/cc/layers/solid_color_layer_impl.cc
index 87c2377..7a796fa 100644
--- a/cc/layers/solid_color_layer_impl.cc
+++ b/cc/layers/solid_color_layer_impl.cc
@@ -4,6 +4,8 @@
 
 #include "cc/layers/solid_color_layer_impl.h"
 
+#include <algorithm>
+
 #include "cc/layers/quad_sink.h"
 #include "cc/quads/solid_color_draw_quad.h"
 
diff --git a/cc/layers/solid_color_layer_impl.h b/cc/layers/solid_color_layer_impl.h
index db99945..36be2f7 100644
--- a/cc/layers/solid_color_layer_impl.h
+++ b/cc/layers/solid_color_layer_impl.h
@@ -34,6 +34,6 @@ class CC_EXPORT SolidColorLayerImpl : public LayerImpl {
   const int tile_size_;
 };
 
-}
+}  // namespace cc
 
 #endif  // CC_LAYERS_SOLID_COLOR_LAYER_IMPL_H_
diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h
index a957b4c..1e7b31b 100644
--- a/cc/layers/texture_layer.h
+++ b/cc/layers/texture_layer.h
@@ -102,5 +102,5 @@ class CC_EXPORT TextureLayer : public Layer {
   DISALLOW_COPY_AND_ASSIGN(TextureLayer);
 };
 
-}
+}  // namespace cc
 #endif  // CC_LAYERS_TEXTURE_LAYER_H_
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index 47c92d8..6d20988 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -29,7 +29,7 @@ namespace {
 
 class MockLayerTreeHost : public LayerTreeHost {
  public:
-  MockLayerTreeHost(LayerTreeHostClient* client)
+  explicit MockLayerTreeHost(LayerTreeHostClient* client)
       : LayerTreeHost(client, LayerTreeSettings()) {
     Initialize(scoped_ptr<Thread>(NULL));
   }
diff --git a/cc/layers/tiled_layer.cc b/cc/layers/tiled_layer.cc
index c4f813a..99b44ce 100644
--- a/cc/layers/tiled_layer.cc
+++ b/cc/layers/tiled_layer.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/tiled_layer.h"
 
+#include <algorithm>
+#include <vector>
+
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "build/build_config.h"
@@ -554,7 +557,6 @@ void TiledLayer::UpdateTileTextures(gfx::Rect paint_rect,
         occlusion->overdraw_metrics()->
             DidUpload(gfx::Transform(), source_rect, tile->opaque_rect());
       }
-
     }
   }
 }
diff --git a/cc/layers/tiled_layer.h b/cc/layers/tiled_layer.h
index 94ebada..e6112d0 100644
--- a/cc/layers/tiled_layer.h
+++ b/cc/layers/tiled_layer.h
@@ -139,5 +139,6 @@ class CC_EXPORT TiledLayer : public ContentsScalingLayer {
   DISALLOW_COPY_AND_ASSIGN(TiledLayer);
 };
 
-}
+}  // namespace cc
+
 #endif  // CC_LAYERS_TILED_LAYER_H_
diff --git a/cc/layers/tiled_layer_impl.h b/cc/layers/tiled_layer_impl.h
index ec0c484..0a8b4c8 100644
--- a/cc/layers/tiled_layer_impl.h
+++ b/cc/layers/tiled_layer_impl.h
@@ -5,6 +5,8 @@
 #ifndef CC_LAYERS_TILED_LAYER_IMPL_H_
 #define CC_LAYERS_TILED_LAYER_IMPL_H_
 
+#include <string>
+
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 
diff --git a/cc/layers/tiled_layer_unittest.cc b/cc/layers/tiled_layer_unittest.cc
index e9d3a78..dd6c06e 100644
--- a/cc/layers/tiled_layer_unittest.cc
+++ b/cc/layers/tiled_layer_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "cc/layers/tiled_layer.h"
 
+#include <limits>
+#include <vector>
+
 #include "cc/debug/overdraw_metrics.h"
 #include "cc/resources/bitmap_content_layer_updater.h"
 #include "cc/resources/layer_painter.h"
@@ -1186,7 +1189,6 @@ TEST_F(TiledLayerTest, TilesPaintedWithOcclusionAndVisiblityConstraints) {
               210000 + 180000 + 180000,
               1);
   EXPECT_EQ(3 + 6 + 6, occluded.overdraw_metrics()->tiles_culled_for_upload());
-
 }
 
 TEST_F(TiledLayerTest, TilesNotPaintedWithoutInvalidation) {
diff --git a/cc/layers/video_frame_provider.h b/cc/layers/video_frame_provider.h
index d59dbe2..784d951 100644
--- a/cc/layers/video_frame_provider.h
+++ b/cc/layers/video_frame_provider.h
@@ -35,6 +35,9 @@ class VideoFrameProvider {
 
     // Notifies the provider's client of a new UV transform matrix to be used.
     virtual void DidUpdateMatrix(const float* matrix) = 0;
+
+   protected:
+    virtual ~Client() {}
   };
 
   // May be called from any thread, but there must be some external guarantee
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
index 4cbdf3c..94125d6 100644
--- a/cc/layers/video_layer_impl.cc
+++ b/cc/layers/video_layer_impl.cc
@@ -452,7 +452,8 @@ void VideoLayerImpl::FreeFramePlanes(ResourceProvider* resource_provider) {
     frame_planes_[i].FreeData(resource_provider);
 }
 
-void VideoLayerImpl::FreeUnusedFramePlanes(ResourceProvider* resource_provider) {
+void VideoLayerImpl::FreeUnusedFramePlanes(
+    ResourceProvider* resource_provider) {
   size_t first_unused_plane = (frame_ ? media::VideoFrame::NumPlanes(format_)
                                       : 0);
   for (size_t i = first_unused_plane; i < media::VideoFrame::kMaxPlanes; ++i)