Replacing SurfaceReferenceBase and SequenceSurfaceReference with Closures

ui/aura/mus/client_surface_embedder.cc

 // Copyright 2017 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.
 
 #include "ui/aura/mus/client_surface_embedder.h"
 
 #include "cc/surfaces/surface_reference_factory.h"
 #include "ui/aura/window.h"
 
 namespace aura {
 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(); }
 
  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));
   }
 
  protected:
   ~StubSurfaceReferenceFactory() override = default;
 
  private:
   // cc::SurfaceReferenceFactory:
-  void DestroyReference(cc::SurfaceReferenceBase* surface_ref) const override {}
+  void DestroyReference(
+      cc::ScopedSurfaceReferenceBase* surface_ref) const override {}
 
   DISALLOW_COPY_AND_ASSIGN(StubSurfaceReferenceFactory);
 };
 }  // namespace
 
 ClientSurfaceEmbedder::ClientSurfaceEmbedder(Window* window) : window_(window) {
   surface_layer_ = base::MakeUnique<ui::Layer>(ui::LAYER_TEXTURED);
   surface_layer_->SetVisible(true);
   // The frame provided by the parent window->layer() needs to show through
   // the surface layer.
@@ skipping 27 matching lines @@
       gfx::Rect(0, 0, frame_size.width(), frame_size.height()));
   // Clip to window bounds.
   clip_layer_->SetBounds(
       gfx::Rect(0, 0, window_->bounds().width(), window_->bounds().height()));
 
   surface_layer_->SetShowSurface(
       surface_info, make_scoped_refptr(new StubSurfaceReferenceFactory));
 }
 
 }  // namespace aura