Revert of cc: Use worker context for one-copy tile initialization. (patchset #20 id:380001 of https://codereview.chromium.org/1230203007/ )

Reason for revert:
Suspected of colliding with another patch and causing Issue 517719.

Original issue's description:
> cc: Use worker context for one-copy tile initialization.
>
> This moves management of staging resources to
> OneCopyTileTaskWorkerPool class. This makes it possible
> to use a worker context to issue and detect when copy
> operations complete.
>
> BUG=490295
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/d5157ac5afec145b85746b42f2d86383483a8222
> Cr-Commit-Position: refs/heads/master@{#342235}

TBR=piman@chromium.org,primiano@chromium.org,vmiura@chromium.org,vmpstr@chromium.org,reveman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=490295,517719

Review URL: https://codereview.chromium.org/1273163004

Cr-Commit-Position: refs/heads/master@{#342284}

1 files changed, 8 insertions, 5 deletions

diff --git a/cc/resources/resource_pool_unittest.cc b/cc/resources/resource_pool_unittest.cc
index f280f49..035b19e 100644
--- a/cc/resources/resource_pool_unittest.cc
+++ b/cc/resources/resource_pool_unittest.cc
@@ -71,7 +71,8 @@ TEST_F(ResourcePoolTest, AccountingSingleResource) {
   EXPECT_EQ(1u, resource_pool_->total_resource_count());
   EXPECT_EQ(1u, resource_pool_->busy_resource_count());
 
-  resource_pool_->CheckBusyResources();
+  bool wait_if_needed = false;
+  resource_pool_->CheckBusyResources(wait_if_needed);
   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());
@@ -95,25 +96,26 @@ 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();
+  resource_pool_->CheckBusyResources(wait_if_needed);
   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();
+  resource_pool_->CheckBusyResources(wait_if_needed);
   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();
+  resource_pool_->CheckBusyResources(wait_if_needed);
   EXPECT_EQ(2u, resource_provider_->num_resources());
 }
 
@@ -125,6 +127,7 @@ 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);
@@ -132,7 +135,7 @@ TEST_F(ResourcePoolTest, LostResource) {
 
   resource_provider_->LoseResourceForTesting(resource->id());
   resource_pool_->ReleaseResource(resource.Pass(), 0u);
-  resource_pool_->CheckBusyResources();
+  resource_pool_->CheckBusyResources(wait_if_needed);
   EXPECT_EQ(0u, resource_provider_->num_resources());
 }