Replacing SurfaceReferenceBase and SequenceSurfaceReference with Closures

cc/surfaces/surface_reference_factory.h

Index: cc/surfaces/surface_reference_factory.h
diff --git a/cc/surfaces/surface_reference_factory.h b/cc/surfaces/surface_reference_factory.h
index a4a32afa5667029acdef1c326bc267fbc5f76e92..b24fe455860cbc9485711a95b018846614ff6dda 100644
--- a/cc/surfaces/surface_reference_factory.h
+++ b/cc/surfaces/surface_reference_factory.h
@@ -11,16 +11,16 @@
 
 namespace cc {
 
-class SurfaceReferenceBase;
+class ScopedSurfaceReferenceBase;
 
 // Creates surface references. Returns an object of type
-// SurfaceReferenceBase which holds on to its corresponding
+// ScopedSurfaceReferenceBase which holds on to its corresponding
 // surface reference until destruction. The referenced surface
 // will be kept alive as long as there is a reference to it.
 class SurfaceReferenceFactory
     : public base::RefCountedThreadSafe<SurfaceReferenceFactory> {
  public:
-  virtual std::unique_ptr<SurfaceReferenceBase> CreateReference(
+  virtual std::unique_ptr<ScopedSurfaceReferenceBase> CreateReference(
       SurfaceReferenceOwner* owner,
       const SurfaceId& surface_id) const = 0;
 
@@ -30,10 +30,11 @@ class SurfaceReferenceFactory
   virtual ~SurfaceReferenceFactory() = default;
 
  private:
-  friend class SurfaceReferenceBase;
+  friend class ScopedSurfaceReferenceBase;
   friend class base::RefCountedThreadSafe<SurfaceReferenceFactory>;
 
-  virtual void DestroyReference(SurfaceReferenceBase* surface_ref) const = 0;
+  virtual void DestroyReference(
+      ScopedSurfaceReferenceBase* surface_ref) const = 0;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceReferenceFactory);
 };