| Index: cc/layers/layer_unittest.cc
|
| diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
|
| index 8eb58616a0e1df23fd800268abda55b8de9eab5f..0a3f60756843ee1ad208cce4fc0ccb86f9787932 100644
|
| --- a/cc/layers/layer_unittest.cc
|
| +++ b/cc/layers/layer_unittest.cc
|
| @@ -41,7 +41,7 @@ class MockLayerTreeHost : public LayerTreeHost {
|
| public:
|
| explicit MockLayerTreeHost(LayerTreeHostClient* client)
|
| : LayerTreeHost(client, LayerTreeSettings()) {
|
| - Initialize(scoped_ptr<Thread>(NULL));
|
| + Initialize(scoped_ptr<Thread>());
|
| }
|
|
|
| MOCK_METHOD0(SetNeedsCommit, void());
|
| @@ -734,15 +734,13 @@ class LayerTreeHostFactory {
|
| : client_(FakeLayerTreeHostClient::DIRECT_3D) {}
|
|
|
| scoped_ptr<LayerTreeHost> Create() {
|
| - return LayerTreeHost::Create(&client_,
|
| - LayerTreeSettings(),
|
| - scoped_ptr<Thread>(NULL)).Pass();
|
| + return LayerTreeHost::Create(
|
| + &client_, LayerTreeSettings(), scoped_ptr<Thread>()).Pass();
|
| }
|
|
|
| scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) {
|
| - return LayerTreeHost::Create(&client_,
|
| - settings,
|
| - scoped_ptr<Thread>(NULL)).Pass();
|
| + return LayerTreeHost::Create(&client_, settings, scoped_ptr<Thread>())
|
| + .Pass();
|
| }
|
|
|
| private:
|
|
|