| Index: cc/resource_update_controller_unittest.cc
|
| diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc
|
| index 280627d7993c53d3183e6db764b544efdf70044b..0de8968d084ea7879e0b56ecfc0d90796d493989 100644
|
| --- a/cc/resource_update_controller_unittest.cc
|
| +++ b/cc/resource_update_controller_unittest.cc
|
| @@ -350,7 +350,7 @@ protected:
|
|
|
| class FakeResourceUpdateController : public cc::ResourceUpdateController {
|
| public:
|
| - static scoped_ptr<FakeResourceUpdateController> create(cc::ResourceUpdateControllerClient* client, cc::Thread* thread, scoped_ptr<ResourceUpdateQueue> queue, ResourceProvider* resourceProvider)
|
| + static scoped_ptr<FakeResourceUpdateController> Create(cc::ResourceUpdateControllerClient* client, cc::Thread* thread, scoped_ptr<ResourceUpdateQueue> queue, ResourceProvider* resourceProvider)
|
| {
|
| return make_scoped_ptr(new FakeResourceUpdateController(client, thread, queue.Pass(), resourceProvider));
|
| }
|
| @@ -390,7 +390,7 @@ TEST_F(ResourceUpdateControllerTest, UpdateMoreTextures)
|
|
|
| DebugScopedSetImplThreadAndMainThreadBlocked
|
| implThreadAndMainThreadBlocked(&m_proxy);
|
| - scoped_ptr<FakeResourceUpdateController> controller(FakeResourceUpdateController::create(&client, &thread, m_queue.Pass(), m_resourceProvider.get()));
|
| + scoped_ptr<FakeResourceUpdateController> controller(FakeResourceUpdateController::Create(&client, &thread, m_queue.Pass(), m_resourceProvider.get()));
|
|
|
| controller->setNow(
|
| controller->Now() + base::TimeDelta::FromMilliseconds(1));
|
| @@ -437,7 +437,7 @@ TEST_F(ResourceUpdateControllerTest, NoMoreUpdates)
|
|
|
| DebugScopedSetImplThreadAndMainThreadBlocked
|
| implThreadAndMainThreadBlocked(&m_proxy);
|
| - scoped_ptr<FakeResourceUpdateController> controller(FakeResourceUpdateController::create(&client, &thread, m_queue.Pass(), m_resourceProvider.get()));
|
| + scoped_ptr<FakeResourceUpdateController> controller(FakeResourceUpdateController::Create(&client, &thread, m_queue.Pass(), m_resourceProvider.get()));
|
|
|
| controller->setNow(
|
| controller->Now() + base::TimeDelta::FromMilliseconds(1));
|
| @@ -476,7 +476,7 @@ TEST_F(ResourceUpdateControllerTest, UpdatesCompleteInFiniteTime)
|
|
|
| DebugScopedSetImplThreadAndMainThreadBlocked
|
| implThreadAndMainThreadBlocked(&m_proxy);
|
| - scoped_ptr<FakeResourceUpdateController> controller(FakeResourceUpdateController::create(&client, &thread, m_queue.Pass(), m_resourceProvider.get()));
|
| + scoped_ptr<FakeResourceUpdateController> controller(FakeResourceUpdateController::Create(&client, &thread, m_queue.Pass(), m_resourceProvider.get()));
|
|
|
| controller->setNow(
|
| controller->Now() + base::TimeDelta::FromMilliseconds(1));
|
|
|