diff options
Diffstat (limited to 'cc/layers/layer_unittest.cc')
| -rw-r--r-- | cc/layers/layer_unittest.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc index c66eb85..0414acb 100644 --- a/cc/layers/layer_unittest.cc +++ b/cc/layers/layer_unittest.cc @@ -38,9 +38,9 @@ namespace { class MockLayerTreeHost : public LayerTreeHost { public: - explicit MockLayerTreeHost(LayerTreeHostClient* client) + explicit MockLayerTreeHost(FakeLayerTreeHostClient* client) : LayerTreeHost(client, NULL, LayerTreeSettings()) { - Initialize(NULL); + InitializeSingleThreaded(client); } MOCK_METHOD0(SetNeedsCommit, void()); @@ -803,12 +803,17 @@ class LayerTreeHostFactory { : client_(FakeLayerTreeHostClient::DIRECT_3D) {} scoped_ptr<LayerTreeHost> Create() { - return LayerTreeHost::Create(&client_, NULL, LayerTreeSettings(), NULL) - .Pass(); + return LayerTreeHost::CreateSingleThreaded(&client_, + &client_, + NULL, + LayerTreeSettings()).Pass(); } scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) { - return LayerTreeHost::Create(&client_, NULL, settings, NULL).Pass(); + return LayerTreeHost::CreateSingleThreaded(&client_, + &client_, + NULL, + settings).Pass(); } private: |