| Index: cc/layer_unittest.cc
|
| diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
|
| index 2235b420773a079d78391720dde7b1e74cfda7f3..b18a127efd133b5f0770ff9d1701061e47b8b1c0 100644
|
| --- a/cc/layer_unittest.cc
|
| +++ b/cc/layer_unittest.cc
|
| @@ -41,7 +41,7 @@ public:
|
| MockLayerImplTreeHost()
|
| : LayerTreeHost(&m_fakeClient, LayerTreeSettings())
|
| {
|
| - initialize();
|
| + initialize(0);
|
| }
|
|
|
| MOCK_METHOD0(setNeedsCommit, void());
|
| @@ -520,8 +520,6 @@ TEST_F(LayerTest, checkPropertyChangeCausesCorrectBehavior)
|
|
|
| TEST_F(LayerTest, verifyPushPropertiesAccumulatesUpdateRect)
|
| {
|
| - DebugScopedSetImplThread setImplThread;
|
| -
|
| scoped_refptr<Layer> testLayer = Layer::create();
|
| scoped_ptr<LayerImpl> implLayer = LayerImpl::create(1);
|
|
|
| @@ -596,7 +594,7 @@ public:
|
| {
|
| scoped_ptr<FakeLayerImplTreeHost> host(new FakeLayerImplTreeHost);
|
| // The initialize call will fail, since our client doesn't provide a valid GraphicsContext3D, but it doesn't matter in the tests that use this fake so ignore the return value.
|
| - host->initialize();
|
| + host->initialize(0);
|
| return host.Pass();
|
| }
|
|
|
|
|