Update from https://crrev.com/308996

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 7c7c899ff724ba96dfc26eba5712372059ee795d..1e649263682debfd3bde050bed89e076fa32ba9e 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -219,7 +219,6 @@ class PictureLayerImplTest : public testing::Test {
 
     pending_layer_ = static_cast<FakePictureLayerImpl*>(
         host_impl_.pending_tree()->LayerById(id_));
-    pending_layer_->DoPostCommitInitializationIfNeeded();
 
     // Add tilings/tiles for the layer.
     host_impl_.pending_tree()->UpdateDrawProperties();
@@ -2077,7 +2076,6 @@ TEST_F(PictureLayerImplTest, ActivateUninitializedLayer) {
   // to sync from the active layer.
   float raster_page_scale = 10.f * pending_layer_->raster_page_scale();
   pending_layer_->set_raster_page_scale(raster_page_scale);
-  EXPECT_TRUE(pending_layer_->needs_post_commit_initialization());
 
   host_impl_.ActivateSyncTree();
 
@@ -2086,7 +2084,6 @@ TEST_F(PictureLayerImplTest, ActivateUninitializedLayer) {
 
   EXPECT_EQ(0u, active_layer_->num_tilings());
   EXPECT_EQ(raster_page_scale, active_layer_->raster_page_scale());
-  EXPECT_FALSE(active_layer_->needs_post_commit_initialization());
 }
 
 TEST_F(PictureLayerImplTest, ShareTilesOnNextFrame) {
@@ -3617,16 +3614,19 @@ TEST_F(PictureLayerImplTest, UpdateTilesForMasksWithNoVisibleContent) {
 
   scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl_.pending_tree(), 1);
 
+  scoped_refptr<FakePicturePileImpl> pending_pile =
+      FakePicturePileImpl::CreateFilledPile(tile_size, bounds);
   scoped_ptr<FakePictureLayerImpl> layer_with_mask =
-      FakePictureLayerImpl::Create(host_impl_.pending_tree(), 2);
+      FakePictureLayerImpl::CreateWithRasterSource(host_impl_.pending_tree(), 2,
+                                                   pending_pile);
   layer_with_mask->SetBounds(bounds);
   layer_with_mask->SetContentBounds(bounds);
 
-  scoped_refptr<FakePicturePileImpl> pending_pile =
+  scoped_refptr<FakePicturePileImpl> mask_pile =
       FakePicturePileImpl::CreateFilledPile(tile_size, bounds);
   scoped_ptr<FakePictureLayerImpl> mask =
       FakePictureLayerImpl::CreateMaskWithRasterSource(
-          host_impl_.pending_tree(), 3, pending_pile);
+          host_impl_.pending_tree(), 3, mask_pile);
   mask->SetBounds(bounds);
   mask->SetContentBounds(bounds);
   mask->SetDrawsContent(true);
@@ -3636,7 +3636,8 @@ TEST_F(PictureLayerImplTest, UpdateTilesForMasksWithNoVisibleContent) {
       static_cast<FakePictureLayerImpl*>(layer_with_mask->mask_layer());
 
   scoped_ptr<FakePictureLayerImpl> child_of_layer_with_mask =
-      FakePictureLayerImpl::Create(host_impl_.pending_tree(), 4);
+      FakePictureLayerImpl::CreateWithRasterSource(host_impl_.pending_tree(), 4,
+                                                   pending_pile);
   child_of_layer_with_mask->SetBounds(bounds);
   child_of_layer_with_mask->SetContentBounds(bounds);
   child_of_layer_with_mask->SetDrawsContent(true);