cc: Remove LayerImpl::SetContentBounds()

The method is now empty, remove all callsites, which are by far
mostly all tests at this point.

R=enne, vmpstr
BUG=413479
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1180073015

Cr-Commit-Position: refs/heads/master@{#334989}

17 files changed, 0 insertions, 58 deletions

diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index b5743dd..7fe6249 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -72,19 +72,16 @@ class DelegatedRendererLayerImplTestSimple
 
     layer_before->SetPosition(gfx::Point(20, 20));
     layer_before->SetBounds(gfx::Size(14, 14));
-    layer_before->SetContentBounds(gfx::Size(14, 14));
     layer_before->SetDrawsContent(true);
     layer_before->SetHasRenderSurface(true);
 
     layer_after->SetPosition(gfx::Point(5, 5));
     layer_after->SetBounds(gfx::Size(15, 15));
-    layer_after->SetContentBounds(gfx::Size(15, 15));
     layer_after->SetDrawsContent(true);
     layer_after->SetHasRenderSurface(true);
 
     delegated_renderer_layer->SetPosition(gfx::Point(3, 3));
     delegated_renderer_layer->SetBounds(gfx::Size(10, 10));
-    delegated_renderer_layer->SetContentBounds(gfx::Size(10, 10));
     delegated_renderer_layer->SetDrawsContent(true);
     gfx::Transform transform;
     transform.Translate(1.0, 1.0);
@@ -148,7 +145,6 @@ TEST_F(DelegatedRendererLayerImplTest,
 
     delegated_renderer_layer->SetPosition(gfx::Point(3, 3));
     delegated_renderer_layer->SetBounds(gfx::Size(10, 10));
-    delegated_renderer_layer->SetContentBounds(gfx::Size(10, 10));
     delegated_renderer_layer->SetDrawsContent(true);
     delegated_renderer_layer->SetHasRenderSurface(true);
     gfx::Transform transform;
@@ -228,7 +224,6 @@ TEST_F(DelegatedRendererLayerImplTest,
 
     delegated_renderer_layer->SetPosition(gfx::Point(3, 3));
     delegated_renderer_layer->SetBounds(gfx::Size(10, 10));
-    delegated_renderer_layer->SetContentBounds(gfx::Size(10, 10));
     delegated_renderer_layer->SetDrawsContent(true);
     delegated_renderer_layer->SetHasRenderSurface(true);
     gfx::Transform transform;
@@ -633,7 +628,6 @@ class DelegatedRendererLayerImplTestTransform
 
     delegated_renderer_layer->SetPosition(gfx::Point(20, 20));
     delegated_renderer_layer->SetBounds(gfx::Size(75, 75));
-    delegated_renderer_layer->SetContentBounds(gfx::Size(75, 75));
     delegated_renderer_layer->SetDrawsContent(true);
     gfx::Transform transform;
     transform.Scale(2.0, 2.0);
@@ -1066,7 +1060,6 @@ class DelegatedRendererLayerImplTestClip
 
     delegated_renderer_layer->SetPosition(gfx::Point(20, 20));
     delegated_renderer_layer->SetBounds(gfx::Size(50, 50));
-    delegated_renderer_layer->SetContentBounds(gfx::Size(50, 50));
     delegated_renderer_layer->SetDrawsContent(true);
 
     RenderPassList delegated_render_passes;
@@ -1174,7 +1167,6 @@ class DelegatedRendererLayerImplTestClip
 
       clip_layer->SetPosition(clip_rect.origin());
       clip_layer->SetBounds(clip_rect.size());
-      clip_layer->SetContentBounds(clip_rect.size());
       clip_layer->SetMasksToBounds(true);
 
       origin_layer->SetPosition(
@@ -1446,7 +1438,6 @@ TEST_F(DelegatedRendererLayerImplTest, Occlusion) {
   FakeDelegatedRendererLayerImpl* delegated_renderer_layer_impl =
       impl.AddChildToRoot<FakeDelegatedRendererLayerImpl>();
   delegated_renderer_layer_impl->SetBounds(layer_size);
-  delegated_renderer_layer_impl->SetContentBounds(layer_size);
   delegated_renderer_layer_impl->SetDrawsContent(true);
 
   // Contributing render pass is offset by a transform and holds a quad that
@@ -1614,7 +1605,6 @@ TEST_F(DelegatedRendererLayerImplTest, DeviceScaleFactorOcclusion) {
   FakeDelegatedRendererLayerImpl* delegated_renderer_layer_impl =
       impl.AddChildToRoot<FakeDelegatedRendererLayerImpl>();
   delegated_renderer_layer_impl->SetBounds(layer_size);
-  delegated_renderer_layer_impl->SetContentBounds(layer_size);
   delegated_renderer_layer_impl->SetDrawsContent(true);
 
   // Contributing render pass is offset by a transform and holds a quad that
@@ -1672,7 +1662,6 @@ TEST_F(DelegatedRendererLayerImplTest, PushPropertiesTo) {
   scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer_impl =
       FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 5);
   delegated_renderer_layer_impl->SetBounds(layer_size);
-  delegated_renderer_layer_impl->SetContentBounds(layer_size);
   delegated_renderer_layer_impl->SetDrawsContent(true);
 
   RenderPassList delegated_render_passes;
diff --git a/cc/layers/io_surface_layer_impl_unittest.cc b/cc/layers/io_surface_layer_impl_unittest.cc
index 1c9256c..0ef2ec8 100644
--- a/cc/layers/io_surface_layer_impl_unittest.cc
+++ b/cc/layers/io_surface_layer_impl_unittest.cc
@@ -19,7 +19,6 @@ TEST(IOSurfaceLayerImplTest, Occlusion) {
   IOSurfaceLayerImpl* io_surface_layer_impl =
       impl.AddChildToRoot<IOSurfaceLayerImpl>();
   io_surface_layer_impl->SetBounds(layer_size);
-  io_surface_layer_impl->SetContentBounds(layer_size);
   io_surface_layer_impl->SetDrawsContent(true);
 
   io_surface_layer_impl->SetIOSurfaceProperties(1, gfx::Size(1, 1));
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index d1c173e..25de9a4 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -1154,7 +1154,6 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
   layer->SetBounds(use_paint_properties ? paint_properties_.bounds
                                         : bounds_);
   layer->SetContentsScale(1.f, 1.f);
-  layer->SetContentBounds(bounds());
 
   if (frame_viewer_instrumentation::IsTracingLayerTreeSnapshots())
     layer->SetDebugInfo(TakeDebugInfo());
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index d4b1089..04ad44f 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -530,7 +530,6 @@ void LayerImpl::PushPropertiesTo(LayerImpl* layer) {
   layer->SetTransformOrigin(transform_origin_);
   layer->SetBackgroundColor(background_color_);
   layer->SetBounds(bounds_);
-  layer->SetContentBounds(bounds_);
   layer->SetContentsScale(contents_scale_x(), contents_scale_y());
   layer->SetDoubleSided(double_sided_);
   layer->SetDrawCheckerboardForMissingTiles(
@@ -1148,10 +1147,6 @@ void LayerImpl::AddDamageRect(const gfx::RectF& damage_rect) {
   damage_rect_ = gfx::UnionRects(damage_rect_, damage_rect);
 }
 
-// TODO(danakj): Remove this after impl_side_painting.
-void LayerImpl::SetContentBounds(const gfx::Size& content_bounds) {
-}
-
 void LayerImpl::SetContentsScale(float contents_scale_x,
                                  float contents_scale_y) {
   if (this->contents_scale_x() == contents_scale_x &&
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 258e27a..47ca9e3 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -421,8 +421,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   void SetBoundsDelta(const gfx::Vector2dF& bounds_delta);
   gfx::Vector2dF bounds_delta() const { return bounds_delta_; }
 
-  void SetContentBounds(const gfx::Size& content_bounds);
-
   float contents_scale_x() const { return draw_properties_.contents_scale_x; }
   float contents_scale_y() const { return draw_properties_.contents_scale_y; }
   void SetContentsScale(float contents_scale_x, float contents_scale_y);
diff --git a/cc/layers/nine_patch_layer_impl_unittest.cc b/cc/layers/nine_patch_layer_impl_unittest.cc
index 8537ddb..2e230ee 100644
--- a/cc/layers/nine_patch_layer_impl_unittest.cc
+++ b/cc/layers/nine_patch_layer_impl_unittest.cc
@@ -54,7 +54,6 @@ void NinePatchLayerLayoutTest(const gfx::Size& bitmap_size,
       NinePatchLayerImpl::Create(host_impl.active_tree(), 1);
   layer->draw_properties().visible_content_rect = visible_content_rect;
   layer->SetBounds(layer_size);
-  layer->SetContentBounds(layer_size);
   layer->SetHasRenderSurface(true);
   layer->draw_properties().render_target = layer.get();
 
@@ -231,7 +230,6 @@ TEST(NinePatchLayerImplTest, Occlusion) {
   NinePatchLayerImpl* nine_patch_layer_impl =
       impl.AddChildToRoot<NinePatchLayerImpl>();
   nine_patch_layer_impl->SetBounds(layer_size);
-  nine_patch_layer_impl->SetContentBounds(layer_size);
   nine_patch_layer_impl->SetDrawsContent(true);
   nine_patch_layer_impl->SetUIResourceId(uid);
   nine_patch_layer_impl->SetImageBounds(gfx::Size(10, 10));
@@ -304,7 +302,6 @@ TEST(NinePatchLayerImplTest, OpaqueRect) {
   NinePatchLayerImpl *nine_patch_layer_impl =
       impl.AddChildToRoot<NinePatchLayerImpl>();
   nine_patch_layer_impl->SetBounds(layer_size);
-  nine_patch_layer_impl->SetContentBounds(layer_size);
   nine_patch_layer_impl->SetDrawsContent(true);
 
   impl.CalcDrawProps(viewport_size);
diff --git a/cc/layers/painted_scrollbar_layer_impl_unittest.cc b/cc/layers/painted_scrollbar_layer_impl_unittest.cc
index 3fb3fb2..5a7229f 100644
--- a/cc/layers/painted_scrollbar_layer_impl_unittest.cc
+++ b/cc/layers/painted_scrollbar_layer_impl_unittest.cc
@@ -38,7 +38,6 @@ TEST(PaintedScrollbarLayerImplTest, Occlusion) {
   PaintedScrollbarLayerImpl* scrollbar_layer_impl =
       impl.AddChildToRoot<PaintedScrollbarLayerImpl>(orientation);
   scrollbar_layer_impl->SetBounds(layer_size);
-  scrollbar_layer_impl->SetContentBounds(layer_size);
   scrollbar_layer_impl->SetContentsOpaque(true);
   scrollbar_layer_impl->set_internal_contents_scale_and_bounds(
       scale, scaled_layer_size);
diff --git a/cc/layers/picture_image_layer_impl_unittest.cc b/cc/layers/picture_image_layer_impl_unittest.cc
index cef2d5e..4082913 100644
--- a/cc/layers/picture_image_layer_impl_unittest.cc
+++ b/cc/layers/picture_image_layer_impl_unittest.cc
@@ -59,7 +59,6 @@ class PictureImageLayerImplTest : public testing::Test {
         new TestablePictureImageLayerImpl(tree, id);
     layer->raster_source_ = FakePicturePileImpl::CreateInfiniteFilledPile();
     layer->SetBounds(layer->raster_source_->GetSize());
-    layer->SetContentBounds(layer->raster_source_->GetSize());
     return make_scoped_ptr(layer);
   }
 
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 18ca3a9..0f251f6 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -223,7 +223,6 @@ class PictureLayerImplTest : public testing::Test {
     pending_root->SetHasRenderSurface(true);
     // The bounds() just mirror the pile size.
     pending_layer->SetBounds(raster_source->GetSize());
-    pending_layer->SetContentBounds(raster_source->GetSize());
     pending_layer->SetRasterSourceOnPending(raster_source, invalidation);
 
     pending_root->AddChild(pending_layer.Pass());
@@ -1295,7 +1294,6 @@ TEST_F(PictureLayerImplTest, DontAddLowResForSmallLayers) {
       FakePictureLayerImpl::CreateMaskWithRasterSource(
           host_impl_.pending_tree(), 3, pending_pile);
   mask->SetBounds(layer_bounds);
-  mask->SetContentBounds(layer_bounds);
   mask->SetDrawsContent(true);
 
   SetupDrawPropertiesAndUpdateTiles(
@@ -1319,7 +1317,6 @@ TEST_F(PictureLayerImplTest, HugeMasksGetScaledDown) {
       FakePictureLayerImpl::CreateMaskWithRasterSource(
           host_impl_.pending_tree(), 3, valid_pile);
   mask_ptr->SetBounds(layer_bounds);
-  mask_ptr->SetContentBounds(layer_bounds);
   mask_ptr->SetDrawsContent(true);
   pending_layer_->SetMaskLayer(mask_ptr.Pass());
   pending_layer_->SetHasRenderSurface(true);
@@ -1371,7 +1368,6 @@ TEST_F(PictureLayerImplTest, HugeMasksGetScaledDown) {
 
   SetupPendingTree(huge_pile);
   pending_mask->SetBounds(huge_bounds);
-  pending_mask->SetContentBounds(huge_bounds);
   pending_mask->SetRasterSourceOnPending(huge_pile, Region());
 
   host_impl_.AdvanceToNextFrame(base::TimeDelta::FromMilliseconds(1));
@@ -1424,7 +1420,6 @@ TEST_F(PictureLayerImplTest, HugeMasksGetScaledDown) {
 
   SetupPendingTree(extra_huge_pile);
   pending_mask->SetBounds(extra_huge_bounds);
-  pending_mask->SetContentBounds(extra_huge_bounds);
   pending_mask->SetRasterSourceOnPending(extra_huge_pile, Region());
 
   EXPECT_FALSE(pending_mask->CanHaveTilings());
@@ -1451,7 +1446,6 @@ TEST_F(PictureLayerImplTest, ScaledMaskLayer) {
       FakePictureLayerImpl::CreateMaskWithRasterSource(
           host_impl_.pending_tree(), 3, valid_pile);
   mask_ptr->SetBounds(layer_bounds);
-  mask_ptr->SetContentBounds(layer_bounds);
   mask_ptr->SetDrawsContent(true);
   pending_layer_->SetMaskLayer(mask_ptr.Pass());
   pending_layer_->SetHasRenderSurface(true);
@@ -3976,7 +3970,6 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
   pending_layer_->AddChild(LayerImpl::Create(host_impl_.pending_tree(), 1));
   LayerImpl* layer1 = pending_layer_->children()[0];
   layer1->SetBounds(layer_bounds);
-  layer1->SetContentBounds(layer_bounds);
   layer1->SetDrawsContent(true);
   layer1->SetContentsOpaque(true);
   layer1->SetPosition(occluding_layer_position);
@@ -4072,7 +4065,6 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
   pending_layer_->AddChild(LayerImpl::Create(host_impl_.pending_tree(), 1));
   LayerImpl* layer1 = pending_layer_->children()[0];
   layer1->SetBounds(layer_bounds);
-  layer1->SetContentBounds(layer_bounds);
   layer1->SetDrawsContent(true);
   layer1->SetContentsOpaque(true);
   layer1->SetPosition(occluding_layer_position);
@@ -4173,7 +4165,6 @@ TEST_F(OcclusionTrackingPictureLayerImplTest, OcclusionForDifferentScales) {
   pending_layer_->AddChild(LayerImpl::Create(host_impl_.pending_tree(), 1));
   LayerImpl* layer1 = pending_layer_->children()[0];
   layer1->SetBounds(layer_bounds);
-  layer1->SetContentBounds(layer_bounds);
   layer1->SetDrawsContent(true);
   layer1->SetContentsOpaque(true);
   layer1->SetPosition(occluding_layer_position);
@@ -4249,7 +4240,6 @@ TEST_F(OcclusionTrackingPictureLayerImplTest, DifferentOcclusionOnTrees) {
   pending_layer_->AddChild(LayerImpl::Create(host_impl_.pending_tree(), 2));
   LayerImpl* layer1 = pending_layer_->children()[0];
   layer1->SetBounds(layer_bounds);
-  layer1->SetContentBounds(layer_bounds);
   layer1->SetDrawsContent(true);
   layer1->SetContentsOpaque(true);
   layer1->SetPosition(occluding_layer_position);
@@ -4343,7 +4333,6 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
   pending_layer_->AddChild(LayerImpl::Create(host_impl_.pending_tree(), 2));
   LayerImpl* active_occluding_layer = pending_layer_->children()[0];
   active_occluding_layer->SetBounds(layer_bounds);
-  active_occluding_layer->SetContentBounds(layer_bounds);
   active_occluding_layer->SetDrawsContent(true);
   active_occluding_layer->SetContentsOpaque(true);
   active_occluding_layer->SetPosition(active_occluding_layer_position);
@@ -4358,7 +4347,6 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
   pending_layer_->AddChild(LayerImpl::Create(host_impl_.pending_tree(), 3));
   LayerImpl* pending_occluding_layer = pending_layer_->children()[0];
   pending_occluding_layer->SetBounds(layer_bounds);
-  pending_occluding_layer->SetContentBounds(layer_bounds);
   pending_occluding_layer->SetDrawsContent(true);
   pending_occluding_layer->SetContentsOpaque(true);
   pending_occluding_layer->SetPosition(pending_occluding_layer_position);
diff --git a/cc/layers/render_surface_impl_unittest.cc b/cc/layers/render_surface_impl_unittest.cc
index 9934cd6..e5db867 100644
--- a/cc/layers/render_surface_impl_unittest.cc
+++ b/cc/layers/render_surface_impl_unittest.cc
@@ -18,7 +18,6 @@ TEST(RenderSurfaceLayerImplTest, Occlusion) {
 
   LayerImpl* owning_layer_impl = impl.AddChildToRoot<LayerImpl>();
   owning_layer_impl->SetBounds(layer_size);
-  owning_layer_impl->SetContentBounds(layer_size);
   owning_layer_impl->SetDrawsContent(true);
   owning_layer_impl->SetHasRenderSurface(true);
 
diff --git a/cc/layers/solid_color_layer_impl_unittest.cc b/cc/layers/solid_color_layer_impl_unittest.cc
index 8d32780..ed33026 100644
--- a/cc/layers/solid_color_layer_impl_unittest.cc
+++ b/cc/layers/solid_color_layer_impl_unittest.cc
@@ -33,7 +33,6 @@ TEST(SolidColorLayerImplTest, VerifyTilingCompleteAndNoOverlap) {
       SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
   layer->draw_properties().visible_content_rect = visible_content_rect;
   layer->SetBounds(layer_size);
-  layer->SetContentBounds(layer_size);
   layer->SetHasRenderSurface(true);
   layer->draw_properties().render_target = layer.get();
 
@@ -59,7 +58,6 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBackgroundColorInQuad) {
       SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
   layer->draw_properties().visible_content_rect = visible_content_rect;
   layer->SetBounds(layer_size);
-  layer->SetContentBounds(layer_size);
   layer->SetBackgroundColor(test_color);
   layer->SetHasRenderSurface(true);
   layer->draw_properties().render_target = layer.get();
@@ -88,7 +86,6 @@ TEST(SolidColorLayerImplTest, VerifyCorrectOpacityInQuad) {
       SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
   layer->draw_properties().visible_content_rect = visible_content_rect;
   layer->SetBounds(layer_size);
-  layer->SetContentBounds(layer_size);
   layer->draw_properties().opacity = opacity;
   layer->SetHasRenderSurface(true);
   layer->draw_properties().render_target = layer.get();
@@ -116,7 +113,6 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBlendModeInQuad) {
   scoped_ptr<SolidColorLayerImpl> layer =
       SolidColorLayerImpl::Create(host_impl.active_tree(), 1);
   layer->SetBounds(layer_size);
-  layer->SetContentBounds(layer_size);
   layer->draw_properties().blend_mode = blend_mode;
 
   AppendQuadsData data;
@@ -215,7 +211,6 @@ TEST(SolidColorLayerImplTest, Occlusion) {
       impl.AddChildToRoot<SolidColorLayerImpl>();
   solid_color_layer_impl->SetBackgroundColor(SkColorSetARGB(255, 10, 20, 30));
   solid_color_layer_impl->SetBounds(layer_size);
-  solid_color_layer_impl->SetContentBounds(layer_size);
   solid_color_layer_impl->SetDrawsContent(true);
 
   impl.CalcDrawProps(viewport_size);
diff --git a/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc b/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc
index b27c84b..a8d59e5 100644
--- a/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc
+++ b/cc/layers/solid_color_scrollbar_layer_impl_unittest.cc
@@ -30,7 +30,6 @@ TEST(SolidColorScrollbarLayerImplTest, Occlusion) {
           is_left_side_vertical_scrollbar,
           is_overlay);
   scrollbar_layer_impl->SetBounds(layer_size);
-  scrollbar_layer_impl->SetContentBounds(layer_size);
   scrollbar_layer_impl->SetDrawsContent(true);
   scrollbar_layer_impl->SetCurrentPos(100.f / 4);
   scrollbar_layer_impl->SetMaximum(100);
diff --git a/cc/layers/surface_layer_impl_unittest.cc b/cc/layers/surface_layer_impl_unittest.cc
index 39577a3..ab0db38 100644
--- a/cc/layers/surface_layer_impl_unittest.cc
+++ b/cc/layers/surface_layer_impl_unittest.cc
@@ -19,7 +19,6 @@ TEST(SurfaceLayerImplTest, Occlusion) {
   SurfaceLayerImpl* surface_layer_impl =
       impl.AddChildToRoot<SurfaceLayerImpl>();
   surface_layer_impl->SetBounds(layer_size);
-  surface_layer_impl->SetContentBounds(layer_size);
   surface_layer_impl->SetDrawsContent(true);
   SurfaceId surface_id(9);
   surface_layer_impl->SetSurfaceId(surface_id);
diff --git a/cc/layers/texture_layer_impl_unittest.cc b/cc/layers/texture_layer_impl_unittest.cc
index cbe80e1..d3f660e 100644
--- a/cc/layers/texture_layer_impl_unittest.cc
+++ b/cc/layers/texture_layer_impl_unittest.cc
@@ -31,7 +31,6 @@ TEST(TextureLayerImplTest, Occlusion) {
   TextureLayerImpl* texture_layer_impl =
       impl.AddChildToRoot<TextureLayerImpl>();
   texture_layer_impl->SetBounds(layer_size);
-  texture_layer_impl->SetContentBounds(layer_size);
   texture_layer_impl->SetDrawsContent(true);
   texture_layer_impl->SetTextureMailbox(
       texture_mailbox,
diff --git a/cc/layers/ui_resource_layer_impl_unittest.cc b/cc/layers/ui_resource_layer_impl_unittest.cc
index c093a86..dfb17eb 100644
--- a/cc/layers/ui_resource_layer_impl_unittest.cc
+++ b/cc/layers/ui_resource_layer_impl_unittest.cc
@@ -33,7 +33,6 @@ scoped_ptr<UIResourceLayerImpl> GenerateUIResourceLayer(
       UIResourceLayerImpl::Create(host_impl->active_tree(), 1);
   layer->draw_properties().visible_content_rect = visible_content_rect;
   layer->SetBounds(layer_size);
-  layer->SetContentBounds(layer_size);
   layer->SetHasRenderSurface(true);
   layer->draw_properties().render_target = layer.get();
 
@@ -174,7 +173,6 @@ TEST(UIResourceLayerImplTest, Occlusion) {
   UIResourceLayerImpl* ui_resource_layer_impl =
       impl.AddChildToRoot<UIResourceLayerImpl>();
   ui_resource_layer_impl->SetBounds(layer_size);
-  ui_resource_layer_impl->SetContentBounds(layer_size);
   ui_resource_layer_impl->SetDrawsContent(true);
   ui_resource_layer_impl->SetUIResourceId(uid);
 
diff --git a/cc/layers/video_frame_provider_client_impl_unittest.cc b/cc/layers/video_frame_provider_client_impl_unittest.cc
index f2f2c0d..05385e4 100644
--- a/cc/layers/video_frame_provider_client_impl_unittest.cc
+++ b/cc/layers/video_frame_provider_client_impl_unittest.cc
@@ -76,7 +76,6 @@ class VideoFrameProviderClientImplTest : public testing::Test,
     video_layer_impl_ = impl_.AddChildToRoot<VideoLayerImpl>(
         &provider_, media::VIDEO_ROTATION_0);
     video_layer_impl_->SetBounds(layer_size);
-    video_layer_impl_->SetContentBounds(layer_size);
     video_layer_impl_->SetDrawsContent(true);
     client_impl_->SetActiveVideoLayer(video_layer_impl_);
     ASSERT_TRUE(client_impl_->ActiveVideoLayer());
diff --git a/cc/layers/video_layer_impl_unittest.cc b/cc/layers/video_layer_impl_unittest.cc
index 35a07df..5f580d1 100644
--- a/cc/layers/video_layer_impl_unittest.cc
+++ b/cc/layers/video_layer_impl_unittest.cc
@@ -47,7 +47,6 @@ TEST(VideoLayerImplTest, Occlusion) {
   VideoLayerImpl* video_layer_impl =
       impl.AddChildToRoot<VideoLayerImpl>(&provider, media::VIDEO_ROTATION_0);
   video_layer_impl->SetBounds(layer_size);
-  video_layer_impl->SetContentBounds(layer_size);
   video_layer_impl->SetDrawsContent(true);
 
   impl.CalcDrawProps(viewport_size);
@@ -98,7 +97,6 @@ TEST(VideoLayerImplTest, OccludesOtherLayers) {
   scoped_ptr<LayerImpl> layer_impl = LayerImpl::Create(active_tree, 3);
   layer_impl->SetHasRenderSurface(true);
   layer_impl->SetBounds(layer_size);
-  layer_impl->SetContentBounds(layer_size);
   layer_impl->SetDrawsContent(true);
   const auto& draw_properties = layer_impl->draw_properties();
 
@@ -106,7 +104,6 @@ TEST(VideoLayerImplTest, OccludesOtherLayers) {
   scoped_ptr<VideoLayerImpl> video_layer_impl = VideoLayerImpl::Create(
       active_tree, 4, &provider, media::VIDEO_ROTATION_0);
   video_layer_impl->SetBounds(layer_size);
-  video_layer_impl->SetContentBounds(layer_size);
   video_layer_impl->SetDrawsContent(true);
   video_layer_impl->SetContentsOpaque(true);
 
@@ -167,7 +164,6 @@ TEST(VideoLayerImplTest, Rotated0) {
   VideoLayerImpl* video_layer_impl =
       impl.AddChildToRoot<VideoLayerImpl>(&provider, media::VIDEO_ROTATION_0);
   video_layer_impl->SetBounds(layer_size);
-  video_layer_impl->SetContentBounds(layer_size);
   video_layer_impl->SetDrawsContent(true);
 
   impl.CalcDrawProps(viewport_size);
@@ -207,7 +203,6 @@ TEST(VideoLayerImplTest, Rotated90) {
   VideoLayerImpl* video_layer_impl =
       impl.AddChildToRoot<VideoLayerImpl>(&provider, media::VIDEO_ROTATION_90);
   video_layer_impl->SetBounds(layer_size);
-  video_layer_impl->SetContentBounds(layer_size);
   video_layer_impl->SetDrawsContent(true);
 
   impl.CalcDrawProps(viewport_size);
@@ -247,7 +242,6 @@ TEST(VideoLayerImplTest, Rotated180) {
   VideoLayerImpl* video_layer_impl =
       impl.AddChildToRoot<VideoLayerImpl>(&provider, media::VIDEO_ROTATION_180);
   video_layer_impl->SetBounds(layer_size);
-  video_layer_impl->SetContentBounds(layer_size);
   video_layer_impl->SetDrawsContent(true);
 
   impl.CalcDrawProps(viewport_size);
@@ -287,7 +281,6 @@ TEST(VideoLayerImplTest, Rotated270) {
   VideoLayerImpl* video_layer_impl =
       impl.AddChildToRoot<VideoLayerImpl>(&provider, media::VIDEO_ROTATION_270);
   video_layer_impl->SetBounds(layer_size);
-  video_layer_impl->SetContentBounds(layer_size);
   video_layer_impl->SetDrawsContent(true);
 
   impl.CalcDrawProps(viewport_size);
@@ -331,7 +324,6 @@ TEST(VideoLayerImplTest, SoftwareVideoFrameGeneratesYUVQuad) {
   VideoLayerImpl* video_layer_impl =
       impl.AddChildToRoot<VideoLayerImpl>(&provider, media::VIDEO_ROTATION_0);
   video_layer_impl->SetBounds(layer_size);
-  video_layer_impl->SetContentBounds(layer_size);
   video_layer_impl->SetDrawsContent(true);
 
   gfx::Rect occluded;
@@ -372,7 +364,6 @@ TEST(VideoLayerImplTest, NativeYUVFrameGeneratesYUVQuad) {
   VideoLayerImpl* video_layer_impl =
       impl.AddChildToRoot<VideoLayerImpl>(&provider, media::VIDEO_ROTATION_0);
   video_layer_impl->SetBounds(layer_size);
-  video_layer_impl->SetContentBounds(layer_size);
   video_layer_impl->SetDrawsContent(true);
 
   gfx::Rect occluded;