Revert of Remove SurfaceFactory::Create and SurfaceFactory::Destroy

cc/surfaces/surface_manager_ref_unittest.cc

Index: cc/surfaces/surface_manager_ref_unittest.cc
diff --git a/cc/surfaces/surface_manager_ref_unittest.cc b/cc/surfaces/surface_manager_ref_unittest.cc
index 9776a6964f2749ac9c07ae48487b53d81488d598..2b797c710710b638eeeb5942ef77d841671a93f6 100644
--- a/cc/surfaces/surface_manager_ref_unittest.cc
+++ b/cc/surfaces/surface_manager_ref_unittest.cc
@@ -10,11 +10,11 @@
 #include "base/memory/ptr_util.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
-#include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_sequence_generator.h"
 #include "testing/gtest/include/gtest/gtest.h"
+
 namespace cc {
 namespace {
 
@@ -24,12 +24,6 @@
 const LocalFrameId kLocalFrame1(1, base::UnguessableToken::Create());
 const LocalFrameId kLocalFrame2(2, base::UnguessableToken::Create());
 
-class StubSurfaceFactoryClient : public SurfaceFactoryClient {
- public:
-  void ReturnResources(const ReturnedResourceArray& resources) override {}
-  void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override {}
-};
-
 // Tests for reference tracking in SurfaceManager.
 class SurfaceManagerRefTest : public testing::Test {
  public:
@@ -39,15 +33,13 @@
   // SurfaceFactory for |frame_sink_id| if necessary.
   SurfaceId CreateSurface(const FrameSinkId& frame_sink_id,
                           const LocalFrameId& local_frame_id) {
-    GetFactory(frame_sink_id)
-        .SubmitCompositorFrame(local_frame_id, CompositorFrame(),
-                               SurfaceFactory::DrawCallback());
+    GetFactory(frame_sink_id).Create(local_frame_id);
     return SurfaceId(frame_sink_id, local_frame_id);
   }
 
   // Destroy Surface with |surface_id|.
   void DestroySurface(const SurfaceId& surface_id) {
-    GetFactory(surface_id.frame_sink_id()).EvictSurface();
+    GetFactory(surface_id.frame_sink_id()).Destroy(surface_id.local_frame_id());
   }
 
  protected:
@@ -55,7 +47,7 @@
     auto& factory_ptr = factories_[frame_sink_id];
     if (!factory_ptr)
       factory_ptr = base::MakeUnique<SurfaceFactory>(frame_sink_id,
-                                                     manager_.get(), &client_);
+                                                     manager_.get(), nullptr);
     return *factory_ptr;
   }
 
@@ -65,8 +57,6 @@
     manager_ = base::MakeUnique<SurfaceManager>();
   }
   void TearDown() override {
-    for (auto& factory : factories_)
-      factory.second->EvictSurface();
     factories_.clear();
     manager_.reset();
   }
@@ -76,7 +66,6 @@
                      FrameSinkIdHash>
       factories_;
   std::unique_ptr<SurfaceManager> manager_;
-  StubSurfaceFactoryClient client_;
 };
 
 }  // namespace