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..5267a16afb1e1687ac339c40c201ab2c4d618812 100644
--- a/ui/aura/mus/client_surface_embedder.cc
+++ b/ui/aura/mus/client_surface_embedder.cc
@@ -4,6 +4,7 @@
 
 #include "ui/aura/mus/client_surface_embedder.h"
 
+#include "cc/surfaces/scoped_surface_reference.h"
 #include "cc/surfaces/surface_reference_factory.h"
 #include "ui/aura/window.h"
 
@@ -12,26 +13,16 @@ namespace {
 
 // TODO(mfomitchev, samans): Remove these stub classes once the SurfaceReference
 // work is complete.
-class StubSurfaceReference : public cc::SurfaceReferenceBase {
- public:
-  StubSurfaceReference(scoped_refptr<const cc::SurfaceReferenceFactory> factory)
-      : cc::SurfaceReferenceBase(factory) {}
-
-  ~StubSurfaceReference() override { Destroy(); }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(StubSurfaceReference);
-};
-
 class StubSurfaceReferenceFactory : public cc::SurfaceReferenceFactory {
  public:
   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));
+    return base::MakeUnique<cc::ScopedSurfaceReference>(
+        make_scoped_refptr(this), cc::SurfaceReference());
   }
 
  protected:
@@ -39,7 +30,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);
 };