Index: cc/texture_layer_unittest.cc |
diff --git a/cc/texture_layer_unittest.cc b/cc/texture_layer_unittest.cc |
index 67ba102cd5bb17cdaeba3bae86cd3e58bddeb666..0c24429a08067345c95e54867590050bf6ddb6e5 100644 |
--- a/cc/texture_layer_unittest.cc |
+++ b/cc/texture_layer_unittest.cc |
@@ -26,7 +26,7 @@ public: |
MockLayerImplTreeHost() |
: LayerTreeHost(&m_fakeClient, LayerTreeSettings()) |
{ |
- initialize(); |
+ initialize(NULL); |
} |
MOCK_METHOD0(acquireLayerTextures, void()); |
@@ -97,10 +97,7 @@ TEST_F(TextureLayerTest, syncImplWhenDrawing) |
scoped_refptr<TextureLayer> testLayer = TextureLayer::create(0); |
ASSERT_TRUE(testLayer); |
scoped_ptr<TextureLayerImpl> implLayer; |
- { |
- DebugScopedSetImplThread setImplThread; |
- implLayer = TextureLayerImpl::create(1); |
- } |
+ implLayer = TextureLayerImpl::create(1); |
ASSERT_TRUE(implLayer); |
EXPECT_CALL(*m_layerTreeHost, acquireLayerTextures()).Times(AnyNumber()); |
@@ -144,11 +141,6 @@ TEST_F(TextureLayerTest, syncImplWhenDrawing) |
testLayer->willModifyTexture(); |
testLayer->setNeedsDisplayRect(dirtyRect); |
Mock::VerifyAndClearExpectations(m_layerTreeHost.get()); |
- |
- { |
- DebugScopedSetImplThread setImplThread; |
- delete implLayer.release(); |
- } |
} |
TEST_F(TextureLayerTest, syncImplWhenRemovingFromTree) |