[cc]Replace use of SurfaceFactory with CompositorFrameSinkSupport in tests

cc/surfaces/compositor_frame_sink_support.h

 // 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.
 
 #ifndef CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_
 #define CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_
 
 #include <memory>
 #include <unordered_set>
 #include <vector>
@@ skipping 38 matching lines @@
 
   void EvictFrame();
   void SetNeedsBeginFrame(bool needs_begin_frame);
   void BeginFrameDidNotSwap(const BeginFrameAck& ack);
   void SubmitCompositorFrame(const LocalSurfaceId& local_surface_id,
                              CompositorFrame frame);
   void RequestCopyOfSurface(std::unique_ptr<CopyOutputRequest> request);
   void ForceReclaimResources();
   void ClaimTemporaryReference(const SurfaceId& surface_id);
 
+  BeginFrameSource* BeginFrameSourceForTesting() const;
+  const ReturnedResourceArray& LastReturnedResourcesForTesting() const;
+  const gfx::Rect& last_damage_rect() { return last_damage_rect_; }
+  const LocalSurfaceId& last_local_surface_id() {
+    return last_local_surface_id_;
+  }
+
  private:
   // Update surface references with SurfaceManager for current CompositorFrame
   // that has |local_surface_id|. UpdateReferences() must be called on
   // |reference_tracker_| before calling this. Will add and remove top-level
   // root references if |display_| is not null.
   void UpdateSurfaceReferences(const SurfaceId& last_surface_id,
                                const LocalSurfaceId& local_surface_id);
 
   void AddTopLevelRootReference(const SurfaceId& surface_id);
   void RemoveTopLevelRootReference(const SurfaceId& surface_id);
@@ skipping 21 matching lines @@
 
   SurfaceManager* const surface_manager_;
 
   const FrameSinkId frame_sink_id_;
 
   SurfaceFactory surface_factory_;
   // Counts the number of CompositorFrames that have been submitted and have not
   // yet received an ACK.
   int ack_pending_count_ = 0;
   ReturnedResourceArray surface_returned_resources_;
+  ReturnedResourceArray last_returned_resources_;
 
   // The begin frame source being observered. Null if none.
   BeginFrameSource* begin_frame_source_ = nullptr;
 
   // The last begin frame args generated by the begin frame source.
   BeginFrameArgs last_begin_frame_args_;
 
   // Whether a request for begin frames has been issued.
   bool needs_begin_frame_ = false;
 
   // Whether or not a frame observer has been added.
   bool added_frame_observer_ = false;
 
   // Track the surface references for the surface corresponding to this
   // compositor frame sink.
   ReferencedSurfaceTracker reference_tracker_;
 
   const bool is_root_;
+  gfx::Rect last_damage_rect_;
+  LocalSurfaceId last_local_surface_id_;
 
   // TODO(staraz): Remove this flag once ui::Compositor no longer needs to call
   // RegisterFrameSinkId().
   // A surfaceSequence's validity is bound to the lifetime of the parent
   // FrameSink that created it. We track the lifetime of FrameSinks through
   // RegisterFrameSinkId and InvalidateFrameSinkId. During startup and GPU
   // restart, a SurfaceSequence created by the top most layer compositor may be
   // used prior to the creation of the associated CompositorFrameSinkSupport.
   // CompositorFrameSinkSupport is created asynchronously when a new GPU channel
   // is established. Once we switch to SurfaceReferences, this ordering concern
   // goes away and we can remove this bool.
   const bool handles_frame_sink_id_invalidation_;
 
   base::WeakPtrFactory<CompositorFrameSinkSupport> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSinkSupport);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_