Index: cc/layer_unittest.cc |
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc |
index 33f37e7d329b814e24c7cb390f16dc003bdd10cb..01c7501cd61366c0ea77a9c81180d6106b00c252 100644 |
--- a/cc/layer_unittest.cc |
+++ b/cc/layer_unittest.cc |
@@ -40,7 +40,7 @@ public: |
MockLayerImplTreeHost() |
: LayerTreeHost(&m_fakeClient, LayerTreeSettings()) |
{ |
- initialize(); |
+ initialize(NULL); |
} |
MOCK_METHOD0(setNeedsCommit, void()); |
@@ -528,8 +528,6 @@ TEST_F(LayerTest, checkPropertyChangeCausesCorrectBehavior) |
TEST_F(LayerTest, verifyPushPropertiesAccumulatesUpdateRect) |
{ |
- DebugScopedSetImplThread setImplThread; |
- |
scoped_refptr<Layer> testLayer = Layer::create(); |
scoped_ptr<LayerImpl> implLayer = LayerImpl::create(1); |
@@ -605,7 +603,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(NULL); |
return host.Pass(); |
} |