Update from https://crrev.com/309717

cc/layers/picture_layer_impl_unittest.cc

Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 65de537442dc20af92f43954aa09c2e0f724d109..695ccd2ee08762bbeffce14fad2748677da200a5 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -86,8 +86,7 @@ class PictureLayerImplTest : public testing::Test {
     host_impl_.SetViewportSize(gfx::Size(10000, 10000));
   }
 
-  virtual ~PictureLayerImplTest() {
-  }
+  ~PictureLayerImplTest() override {}
 
   void SetUp() override { InitializeRenderer(); }
 
@@ -209,6 +208,7 @@ class PictureLayerImplTest : public testing::Test {
       if (!tile_size.IsEmpty())
         pending_layer->set_fixed_tile_size(tile_size);
     }
+    pending_root->SetHasRenderSurface(true);
     // The bounds() just mirror the pile size.
     pending_layer->SetBounds(raster_source->GetSize());
     pending_layer->SetContentBounds(raster_source->GetSize());
@@ -1209,6 +1209,7 @@ TEST_F(PictureLayerImplTest, HugeMasksGetScaledDown) {
   mask_ptr->SetContentBounds(layer_bounds);
   mask_ptr->SetDrawsContent(true);
   pending_layer_->SetMaskLayer(mask_ptr.Pass());
+  pending_layer_->SetHasRenderSurface(true);
 
   time_ticks += base::TimeDelta::FromMilliseconds(1);
   host_impl_.SetCurrentBeginFrameArgs(
@@ -1342,6 +1343,7 @@ TEST_F(PictureLayerImplTest, ScaledMaskLayer) {
   mask_ptr->SetContentBounds(layer_bounds);
   mask_ptr->SetDrawsContent(true);
   pending_layer_->SetMaskLayer(mask_ptr.Pass());
+  pending_layer_->SetHasRenderSurface(true);
 
   time_ticks += base::TimeDelta::FromMilliseconds(1);
   host_impl_.SetCurrentBeginFrameArgs(