Replacing SurfaceReferenceBase and SequenceSurfaceReference with Closures

ui/aura/mus/client_surface_embedder.cc

Index: ui/aura/mus/client_surface_embedder.cc
diff --git a/ui/aura/mus/client_surface_embedder.cc b/ui/aura/mus/client_surface_embedder.cc
index 53bc4f101160c5f60008ae8cdcf95e51d1e0ac14..e620e03790cfd1c41e2587d2825bd07339d40b91 100644
--- a/ui/aura/mus/client_surface_embedder.cc
+++ b/ui/aura/mus/client_surface_embedder.cc
@@ -12,10 +12,10 @@ namespace {
 
 // TODO(mfomitchev, samans): Remove these stub classes once the SurfaceReference
 // work is complete.
-class StubSurfaceReference : public cc::SurfaceReferenceBase {
+class StubSurfaceReference : public cc::ScopedSurfaceReferenceBase {

[Fady Samuel, 2017/01/10 03:05:29]

I just noticed this doesn't actually do anything? How about deleting this and
simply using ScopedSurfaceReference?

  public:
   StubSurfaceReference(scoped_refptr<const cc::SurfaceReferenceFactory> factory)
-      : cc::SurfaceReferenceBase(factory) {}
+      : cc::ScopedSurfaceReferenceBase(factory) {}
 
   ~StubSurfaceReference() override { Destroy(); }
 
@@ -28,7 +28,7 @@ class StubSurfaceReferenceFactory : public cc::SurfaceReferenceFactory {
   StubSurfaceReferenceFactory() = default;
 
   // cc::SurfaceReferenceFactory:
-  std::unique_ptr<cc::SurfaceReferenceBase> CreateReference(
+  std::unique_ptr<cc::ScopedSurfaceReferenceBase> CreateReference(
       cc::SurfaceReferenceOwner* owner,
       const cc::SurfaceId& surface_id) const override {
     return base::MakeUnique<StubSurfaceReference>(make_scoped_refptr(this));
@@ -39,7 +39,8 @@ class StubSurfaceReferenceFactory : public cc::SurfaceReferenceFactory {
 
  private:
   // cc::SurfaceReferenceFactory:
-  void DestroyReference(cc::SurfaceReferenceBase* surface_ref) const override {}
+  void DestroyReference(
+      cc::ScopedSurfaceReferenceBase* surface_ref) const override {}
 
   DISALLOW_COPY_AND_ASSIGN(StubSurfaceReferenceFactory);
 };