Revert of Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink

components/exo/compositor_frame_sink.cc

Index: components/exo/compositor_frame_sink.cc
diff --git a/components/exo/compositor_frame_sink.cc b/components/exo/compositor_frame_sink.cc
deleted file mode 100644
index 9d4ab95e9486326735c13ed2931f8d2f301b45db..0000000000000000000000000000000000000000
--- a/components/exo/compositor_frame_sink.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2016 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 "components/exo/compositor_frame_sink.h"
-
-#include "cc/surfaces/surface.h"
-#include "cc/surfaces/surface_manager.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
-
-namespace exo {
-
-////////////////////////////////////////////////////////////////////////////////
-// ExoComopositorFrameSink, public:
-
-// static
-void CompositorFrameSink::Create(
-    const cc::FrameSinkId& frame_sink_id,
-    cc::SurfaceManager* surface_manager,
-    cc::mojom::MojoCompositorFrameSinkClientPtr client,
-    cc::mojom::MojoCompositorFrameSinkRequest request) {
-  std::unique_ptr<CompositorFrameSink> impl =
-      base::MakeUnique<CompositorFrameSink>(frame_sink_id, surface_manager,
-                                            std::move(client));
-  CompositorFrameSink* compositor_frame_sink = impl.get();
-  compositor_frame_sink->binding_ =
-      mojo::MakeStrongBinding(std::move(impl), std::move(request));
-}
-
-CompositorFrameSink::CompositorFrameSink(
-    const cc::FrameSinkId& frame_sink_id,
-    cc::SurfaceManager* surface_manager,
-    cc::mojom::MojoCompositorFrameSinkClientPtr client)
-    : support_(this, surface_manager, frame_sink_id, nullptr),
-      client_(std::move(client)) {}
-
-CompositorFrameSink::~CompositorFrameSink() {}
-
-////////////////////////////////////////////////////////////////////////////////
-// cc::mojom::MojoCompositorFrameSink overrides:
-
-void CompositorFrameSink::SetNeedsBeginFrame(bool needs_begin_frame) {
-  support_.SetNeedsBeginFrame(needs_begin_frame);
-}
-
-void CompositorFrameSink::SubmitCompositorFrame(
-    const cc::LocalFrameId& local_frame_id,
-    cc::CompositorFrame frame) {
-  support_.SubmitCompositorFrame(local_frame_id, std::move(frame));
-}
-
-void CompositorFrameSink::AddSurfaceReferences(
-    const std::vector<cc::SurfaceReference>& references) {
-  // TODO(fsamuel, staraz): Implement this.
-  NOTIMPLEMENTED();
-}
-
-void CompositorFrameSink::RemoveSurfaceReferences(
-    const std::vector<cc::SurfaceReference>& references) {
-  // TODO(fsamuel, staraz): Implement this.
-  NOTIMPLEMENTED();
-}
-
-void CompositorFrameSink::EvictFrame() {
-  support_.EvictFrame();
-}
-
-void CompositorFrameSink::Require(const cc::LocalFrameId& local_frame_id,
-                                  const cc::SurfaceSequence& sequence) {
-  support_.Require(local_frame_id, sequence);
-}
-
-void CompositorFrameSink::Satisfy(const cc::SurfaceSequence& sequence) {
-  support_.Satisfy(sequence);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// cc::CompositorFrameSinkSupportClient overrides:
-
-void CompositorFrameSink::DidReceiveCompositorFrameAck() {
-  if (client_)
-    client_->DidReceiveCompositorFrameAck();
-}
-
-void CompositorFrameSink::OnBeginFrame(const cc::BeginFrameArgs& args) {
-  if (client_)
-    client_->OnBeginFrame(args);
-}
-
-void CompositorFrameSink::ReclaimResources(
-    const cc::ReturnedResourceArray& resources) {
-  if (client_)
-    client_->ReclaimResources(resources);
-}
-
-void CompositorFrameSink::WillDrawSurface() {
-  if (client_)
-    client_->WillDrawSurface();
-}
-
-}  // namespace exo