Index: cc/layers/texture_layer_unittest.cc |
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc |
index a3c568f49fc57dcacfbb8e702832708586cd46b7..bce1eefc5457b27546ffca51e52fc1137d88fe0e 100644 |
--- a/cc/layers/texture_layer_unittest.cc |
+++ b/cc/layers/texture_layer_unittest.cc |
@@ -194,7 +194,7 @@ TEST_F(TextureLayerTest, SyncImplWhenRemovingFromTree) { |
TEST_F(TextureLayerTest, CheckPropertyChangeCausesCorrectBehavior) { |
scoped_refptr<TextureLayer> test_layer = TextureLayer::Create(NULL); |
- layer_tree_host_->SetRootLayer(test_layer); |
+ EXPECT_SET_NEEDS_COMMIT(1, layer_tree_host_->SetRootLayer(test_layer)); |
// Test properties that should call SetNeedsCommit. All properties need to |
// be set to new values in order for SetNeedsCommit to be called. |
@@ -420,6 +420,8 @@ TEST_F(TextureLayerWithMailboxTest, ReplaceMailboxOnMainThreadBeforeCommit) { |
Mock::VerifyAndClearExpectations(layer_tree_host_.get()); |
Mock::VerifyAndClearExpectations(&test_data_.mock_callback_); |
+ EXPECT_CALL(*layer_tree_host_, AcquireLayerTextures()).Times(0); |
+ EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(AtLeast(1)); |
test_layer->SetTextureMailbox(test_data_.mailbox3_); |
Mock::VerifyAndClearExpectations(layer_tree_host_.get()); |
Mock::VerifyAndClearExpectations(&test_data_.mock_callback_); |