Index: cc/layers/layer_unittest.cc |
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc |
index 0a3f60756843ee1ad208cce4fc0ccb86f9787932..daf45894155a91039a059f92a63e9c7c8a830eb5 100644 |
--- a/cc/layers/layer_unittest.cc |
+++ b/cc/layers/layer_unittest.cc |
@@ -6,7 +6,6 @@ |
#include "cc/animation/keyframed_animation_curve.h" |
#include "cc/base/math_util.h" |
-#include "cc/base/thread.h" |
#include "cc/layers/layer_impl.h" |
#include "cc/resources/layer_painter.h" |
#include "cc/test/animation_test_common.h" |
@@ -41,7 +40,7 @@ class MockLayerTreeHost : public LayerTreeHost { |
public: |
explicit MockLayerTreeHost(LayerTreeHostClient* client) |
: LayerTreeHost(client, LayerTreeSettings()) { |
- Initialize(scoped_ptr<Thread>()); |
+ Initialize(NULL); |
} |
MOCK_METHOD0(SetNeedsCommit, void()); |
@@ -734,13 +733,11 @@ class LayerTreeHostFactory { |
: client_(FakeLayerTreeHostClient::DIRECT_3D) {} |
scoped_ptr<LayerTreeHost> Create() { |
- return LayerTreeHost::Create( |
- &client_, LayerTreeSettings(), scoped_ptr<Thread>()).Pass(); |
+ return LayerTreeHost::Create(&client_, LayerTreeSettings(), NULL).Pass(); |
} |
scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) { |
- return LayerTreeHost::Create(&client_, settings, scoped_ptr<Thread>()) |
- .Pass(); |
+ return LayerTreeHost::Create(&client_, settings, NULL).Pass(); |
} |
private: |