[cc]Replace use of SurfaceFactory with CompositorFrameSinkSupport in tests

cc/surfaces/compositor_frame_sink_support.cc

 // Copyright 2016 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/surfaces/compositor_frame_sink_support.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
@@ skipping 165 matching lines @@
 
 void CompositorFrameSinkSupport::ForceReclaimResources() {
   surface_factory_.ClearSurface();
 }
 
 void CompositorFrameSinkSupport::ClaimTemporaryReference(
     const SurfaceId& surface_id) {
   surface_manager_->AssignTemporaryReference(surface_id, frame_sink_id_);
 }
 
+BeginFrameSource* CompositorFrameSinkSupport::BeginFrameSourceForTesting()
+    const {
+  return begin_frame_source_;
+}
+const ReturnedResourceArray&
+CompositorFrameSinkSupport::LastReturnedResourcesForTesting() const {

[Fady Samuel, 2017/04/05 14:42:32]

Remove this?

[Alex Z., 2017/04/05 20:43:13]

Done.

+  return last_returned_resources_;
+}
+
 void CompositorFrameSinkSupport::ReferencedSurfacesChanged(
     const LocalSurfaceId& local_surface_id,
     const std::vector<SurfaceId>* active_referenced_surfaces,
     const std::vector<SurfaceId>* pending_referenced_surfaces) {
   if (!surface_manager_->using_surface_references())
     return;
 
   SurfaceId last_surface_id = reference_tracker_.current_surface_id();
 
   // Populate list of surface references to add and remove based on reference
   // surfaces in current frame compared with the last frame. The list of
   // surface references includes references from both the pending and active
   // frame if any.
   reference_tracker_.UpdateReferences(local_surface_id,
                                       active_referenced_surfaces,
                                       pending_referenced_surfaces);
 
   UpdateSurfaceReferences(last_surface_id, local_surface_id);
 }
 
 void CompositorFrameSinkSupport::ReturnResources(
     const ReturnedResourceArray& resources) {
+  last_returned_resources_ = resources;

[Fady Samuel, 2017/04/05 14:42:32]

Don't expose this?

[Alex Z., 2017/04/05 20:43:13]

Done.

   if (resources.empty())
     return;
 
   if (!ack_pending_count_ && client_) {
     client_->ReclaimResources(resources);
     return;
   }
 
   std::copy(resources.begin(), resources.end(),
             std::back_inserter(surface_returned_resources_));
 }
 
 void CompositorFrameSinkSupport::SetBeginFrameSource(
     BeginFrameSource* begin_frame_source) {
   if (begin_frame_source_ && added_frame_observer_) {
     begin_frame_source_->RemoveObserver(this);
     added_frame_observer_ = false;
   }
   begin_frame_source_ = begin_frame_source;
   UpdateNeedsBeginFramesInternal();
 }
 
 void CompositorFrameSinkSupport::WillDrawSurface(
     const LocalSurfaceId& local_surface_id,
     const gfx::Rect& damage_rect) {
+  last_local_surface_id_ = local_surface_id;
+  last_damage_rect_ = damage_rect;

[Fady Samuel, 2017/04/05 14:42:32]

Don't expose these. Implement CompositorFrameSinkSupportClient instead in test?

[Alex Z., 2017/04/05 20:43:13]

Done.

   if (client_)
     client_->WillDrawSurface(local_surface_id, damage_rect);
 }
 
 void CompositorFrameSinkSupport::OnBeginFrame(const BeginFrameArgs& args) {
   UpdateNeedsBeginFramesInternal();
   last_begin_frame_args_ = args;
   if (client_)
     client_->OnBeginFrame(args);
 }
@@ skipping 18 matching lines @@
   else
     begin_frame_source_->RemoveObserver(this);
 }
 
 void CompositorFrameSinkSupport::RequestCopyOfSurface(
     std::unique_ptr<CopyOutputRequest> request) {
   surface_factory_.RequestCopyOfSurface(std::move(request));
 }
 
 }  // namespace cc