| Index: cc/resources/resource_pool_unittest.cc
|
| diff --git a/cc/resources/resource_pool_unittest.cc b/cc/resources/resource_pool_unittest.cc
|
| index 96e7591ab8c3bf5a423f5d1b7258d8b667076655..8be2820b2771020a9528a20779c1138ba19534d7 100644
|
| --- a/cc/resources/resource_pool_unittest.cc
|
| +++ b/cc/resources/resource_pool_unittest.cc
|
| @@ -69,8 +69,7 @@ TEST_F(ResourcePoolTest, AccountingSingleResource) {
|
| EXPECT_EQ(1u, resource_pool_->total_resource_count());
|
| EXPECT_EQ(1u, resource_pool_->busy_resource_count());
|
|
|
| - bool wait_if_needed = false;
|
| - resource_pool_->CheckBusyResources(wait_if_needed);
|
| + resource_pool_->CheckBusyResources();
|
| EXPECT_EQ(resource_bytes, resource_pool_->total_memory_usage_bytes());
|
| EXPECT_EQ(0u, resource_pool_->acquired_memory_usage_bytes());
|
| EXPECT_EQ(1u, resource_pool_->total_resource_count());
|
| @@ -94,26 +93,25 @@ TEST_F(ResourcePoolTest, SimpleResourceReuse) {
|
|
|
| gfx::Size size(100, 100);
|
| ResourceFormat format = RGBA_8888;
|
| - bool wait_if_needed = false;
|
|
|
| scoped_ptr<ScopedResource> resource =
|
| resource_pool_->AcquireResource(size, format);
|
| resource_pool_->ReleaseResource(resource.Pass(), 0u);
|
| - resource_pool_->CheckBusyResources(wait_if_needed);
|
| + resource_pool_->CheckBusyResources();
|
| EXPECT_EQ(1u, resource_provider_->num_resources());
|
|
|
| // Same size/format should re-use resource.
|
| resource = resource_pool_->AcquireResource(size, format);
|
| EXPECT_EQ(1u, resource_provider_->num_resources());
|
| resource_pool_->ReleaseResource(resource.Pass(), 0u);
|
| - resource_pool_->CheckBusyResources(wait_if_needed);
|
| + resource_pool_->CheckBusyResources();
|
| EXPECT_EQ(1u, resource_provider_->num_resources());
|
|
|
| // Different size/format should alloate new resource.
|
| resource = resource_pool_->AcquireResource(gfx::Size(50, 50), LUMINANCE_8);
|
| EXPECT_EQ(2u, resource_provider_->num_resources());
|
| resource_pool_->ReleaseResource(resource.Pass(), 0u);
|
| - resource_pool_->CheckBusyResources(wait_if_needed);
|
| + resource_pool_->CheckBusyResources();
|
| EXPECT_EQ(2u, resource_provider_->num_resources());
|
| }
|
|
|
| @@ -125,7 +123,6 @@ TEST_F(ResourcePoolTest, LostResource) {
|
|
|
| gfx::Size size(100, 100);
|
| ResourceFormat format = RGBA_8888;
|
| - bool wait_if_needed = false;
|
|
|
| scoped_ptr<ScopedResource> resource =
|
| resource_pool_->AcquireResource(size, format);
|
| @@ -133,7 +130,7 @@ TEST_F(ResourcePoolTest, LostResource) {
|
|
|
| resource_provider_->LoseResourceForTesting(resource->id());
|
| resource_pool_->ReleaseResource(resource.Pass(), 0u);
|
| - resource_pool_->CheckBusyResources(wait_if_needed);
|
| + resource_pool_->CheckBusyResources();
|
| EXPECT_EQ(0u, resource_provider_->num_resources());
|
| }
|
|
|
|
|