cc: Dedup IPCs to return resources to client

cc/test/fake_output_surface.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/fake_output_surface.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "cc/output/compositor_frame_ack.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
 FakeOutputSurface::FakeOutputSurface(
     scoped_refptr<ContextProvider> context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
@@ skipping 75 matching lines @@
     return false;
   }
 }
 
 void FakeOutputSurface::SetTreeActivationCallback(
     const base::Closure& callback) {
   DCHECK(client_);
   client_->SetTreeActivationCallback(callback);
 }
 
-void FakeOutputSurface::ReturnResource(unsigned id, CompositorFrameAck* ack) {
+void FakeOutputSurface::ReturnResource(unsigned id,
+                                       ReturnedResourceArray* resources) {
   TransferableResourceArray::iterator it;
   for (it = resources_held_by_parent_.begin();
        it != resources_held_by_parent_.end();
        ++it) {
     if (it->id == id)
       break;
   }
   DCHECK(it != resources_held_by_parent_.end());
-  ack->resources.push_back(it->ToReturnedResource());
+  resources->push_back(it->ToReturnedResource());
   resources_held_by_parent_.erase(it);
 }
 
 bool FakeOutputSurface::HasExternalStencilTest() const {
   return has_external_stencil_test_;
 }
 
 bool FakeOutputSurface::SurfaceIsSuspendForRecycle() const {
   return suspended_for_recycle_;
 }
 
 OverlayCandidateValidator* FakeOutputSurface::GetOverlayCandidateValidator()
     const {
   return overlay_candidate_validator_;
 }
 
 void FakeOutputSurface::SetMemoryPolicyToSetAtBind(
     std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind) {
   memory_policy_to_set_at_bind_.swap(memory_policy_to_set_at_bind);
 }
 
 }  // namespace cc