cc: return resources via a ReturnedResource struct rather than TransferableResource

cc/resources/resource_provider_unittest.cc

Index: cc/resources/resource_provider_unittest.cc
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 5bff9a2a0c7ede698f177458b24a48bbfad165c4..3cf3140a34eb08a1e0fe0ac22c5e993e2a09ad10 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -587,7 +587,9 @@ TEST_P(ResourceProviderTest, TransferResources) {
                                                  &list);
     EXPECT_EQ(1u, list.size());
     EXPECT_EQ(id1, list[0].id);
-    child_resource_provider->ReceiveFromParent(list);
+    ReturnedResourceArray returned;
+    ReturnResources(list, &returned);
+    child_resource_provider->ReceiveFromParent(returned);
     // id1 was exported twice, we returned it only once, it should still be
     // in-use.
     EXPECT_TRUE(child_resource_provider->InUseByConsumer(id1));
@@ -597,7 +599,7 @@ TEST_P(ResourceProviderTest, TransferResources) {
     ResourceProvider::ResourceIdArray resource_ids_to_transfer;
     resource_ids_to_transfer.push_back(mapped_id1);
     resource_ids_to_transfer.push_back(mapped_id2);
-    TransferableResourceArray list;
+    ReturnedResourceArray list;
     resource_provider_->PrepareSendToChild(
         child_id, resource_ids_to_transfer, &list);
     ASSERT_EQ(2u, list.size());
@@ -692,7 +694,7 @@ TEST_P(ResourceProviderTest, DeleteTransferredResources) {
     EXPECT_NE(0u, mapped_id);
     ResourceProvider::ResourceIdArray resource_ids_to_transfer;
     resource_ids_to_transfer.push_back(mapped_id);
-    TransferableResourceArray list;
+    ReturnedResourceArray list;
     resource_provider_->PrepareSendToChild(
         child_id, resource_ids_to_transfer, &list);
     ASSERT_EQ(1u, list.size());
@@ -754,7 +756,7 @@ TEST_P(ResourceProviderTest, TextureFilters) {
     // Transfer resources back from the parent to the child.
     ResourceProvider::ResourceIdArray resource_ids_to_transfer;
     resource_ids_to_transfer.push_back(mapped_id);
-    TransferableResourceArray list;
+    ReturnedResourceArray list;
     resource_provider_->PrepareSendToChild(
         child_id, resource_ids_to_transfer, &list);
     ASSERT_EQ(1u, list.size());
@@ -828,7 +830,9 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
 
     // Receive the resource, then delete it, expect the sync points to be
     // consistent.
-    resource_provider_->ReceiveFromParent(list);
+    ReturnedResourceArray returned;
+    ReturnResources(list, &returned);
+    resource_provider_->ReceiveFromParent(returned);
     EXPECT_EQ(1, context()->texture_count());
     EXPECT_EQ(0u, release_sync_point);
 
@@ -877,7 +881,9 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
 
     // Then receive the resource which should release the mailbox, expect the
     // sync points to be consistent.
-    resource_provider_->ReceiveFromParent(list);
+    ReturnedResourceArray returned;
+    ReturnResources(list, &returned);
+    resource_provider_->ReceiveFromParent(returned);
     EXPECT_LE(list[0].sync_point, release_sync_point);
     EXPECT_FALSE(lost_resource);
   }