Replacing SurfaceReferenceBase and SequenceSurfaceReference with Closures

cc/surfaces/scoped_surface_reference_base.h

Index: cc/surfaces/scoped_surface_reference_base.h
diff --git a/cc/surfaces/surface_reference_base.h b/cc/surfaces/scoped_surface_reference_base.h
similarity index 73%
rename from cc/surfaces/surface_reference_base.h
rename to cc/surfaces/scoped_surface_reference_base.h
index e1a578ea8e3064575cd31cc71a706dbd62065fde..9606c9381403c7f31c3dfa58276d4904c9a828dc 100644
--- a/cc/surfaces/surface_reference_base.h
+++ b/cc/surfaces/scoped_surface_reference_base.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_SURFACES_SURFACE_REFERENCE_BASE_H_
-#define CC_SURFACES_SURFACE_REFERENCE_BASE_H_
+#ifndef CC_SURFACES_SCOPED_SURFACE_REFERENCE_BASE_H_
+#define CC_SURFACES_SCOPED_SURFACE_REFERENCE_BASE_H_
 
 #include <memory>
 
@@ -22,12 +22,12 @@ class SurfaceReferenceFactory;
 // To keep things as lightweight as possible, the base class only keeps a
 // pointer to the factory and it's up to the subclasses to decide what other
 // information they need to keep.
-class SurfaceReferenceBase {
+class ScopedSurfaceReferenceBase {
  public:
-  explicit SurfaceReferenceBase(
+  explicit ScopedSurfaceReferenceBase(
       scoped_refptr<const SurfaceReferenceFactory> factory);
 
-  virtual ~SurfaceReferenceBase();
+  virtual ~ScopedSurfaceReferenceBase();
 
  protected:
   void Destroy();
@@ -35,9 +35,9 @@ class SurfaceReferenceBase {
  private:
   scoped_refptr<const SurfaceReferenceFactory> factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(SurfaceReferenceBase);
+  DISALLOW_COPY_AND_ASSIGN(ScopedSurfaceReferenceBase);
 };
 
 }  // namespace cc
 
-#endif  // CC_SURFACES_SURFACE_REFERENCE_BASE_H_
+#endif  // CC_SURFACES_SCOPED_SURFACE_REFERENCE_BASE_H_