| Index: cc/texture_layer_unittest.cc
|
| diff --git a/cc/texture_layer_unittest.cc b/cc/texture_layer_unittest.cc
|
| index f413f27b073bed1dc5cebf6d1263020ffb23e34d..6e659789e6b0f4bbb3b3a1b9a79b0c843478b14f 100644
|
| --- a/cc/texture_layer_unittest.cc
|
| +++ b/cc/texture_layer_unittest.cc
|
| @@ -10,6 +10,7 @@
|
| #include "cc/single_thread_proxy.h"
|
| #include "cc/texture_layer_impl.h"
|
| #include "cc/test/fake_layer_tree_host_client.h"
|
| +#include "cc/thread.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -26,7 +27,7 @@ public:
|
| MockLayerImplTreeHost()
|
| : LayerTreeHost(&m_fakeClient, LayerTreeSettings())
|
| {
|
| - initialize();
|
| + initialize(scoped_ptr<Thread>(NULL));
|
| }
|
|
|
| MOCK_METHOD0(acquireLayerTextures, void());
|
| @@ -97,10 +98,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 +142,6 @@ TEST_F(TextureLayerTest, syncImplWhenDrawing)
|
| testLayer->willModifyTexture();
|
| testLayer->setNeedsDisplayRect(dirtyRect);
|
| Mock::VerifyAndClearExpectations(m_layerTreeHost.get());
|
| -
|
| - {
|
| - DebugScopedSetImplThread setImplThread;
|
| - delete implLayer.release();
|
| - }
|
| }
|
|
|
| TEST_F(TextureLayerTest, syncImplWhenRemovingFromTree)
|
|
|