[cc]Replace use of SurfaceFactory with CompositorFrameSinkSupport in tests

cc/surfaces/compositor_frame_sink_support.cc

Index: cc/surfaces/compositor_frame_sink_support.cc
diff --git a/cc/surfaces/compositor_frame_sink_support.cc b/cc/surfaces/compositor_frame_sink_support.cc
index b0d7dc28df3399d40605455d89aabe40abf9d80e..1c51ec7a6340b7b87bc4edbddd8b091041ab46d9 100644
--- a/cc/surfaces/compositor_frame_sink_support.cc
+++ b/cc/surfaces/compositor_frame_sink_support.cc
@@ -183,6 +183,15 @@ void CompositorFrameSinkSupport::ClaimTemporaryReference(
   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,
@@ -205,6 +214,7 @@ void CompositorFrameSinkSupport::ReferencedSurfacesChanged(
 
 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;
 
@@ -230,6 +240,8 @@ void CompositorFrameSinkSupport::SetBeginFrameSource(
 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);
 }