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

cc/surfaces/display_unittest.cc

Index: cc/surfaces/display_unittest.cc
diff --git a/cc/surfaces/display_unittest.cc b/cc/surfaces/display_unittest.cc
index 4534edb9796002a3ec1b0f28b427f3504453ddad..7b576ac21a8d41c54b66246b8d985fce43e54e4b 100644
--- a/cc/surfaces/display_unittest.cc
+++ b/cc/surfaces/display_unittest.cc
@@ -106,7 +106,6 @@
 
   ~DisplayTest() override {
     manager_.InvalidateFrameSinkId(kArbitraryFrameSinkId);
-    factory_.EvictSurface();
   }
 
   void SetUpDisplay(const RendererSettings& settings,
@@ -197,6 +196,8 @@
   EXPECT_TRUE(scheduler_->display_resized_);
   EXPECT_FALSE(scheduler_->has_new_root_surface);
 
+  factory_.Create(local_frame_id);
+
   // First draw from surface should have full damage.
   RenderPassList pass_list;
   std::unique_ptr<RenderPass> pass = RenderPass::Create();
@@ -413,6 +414,8 @@
               software_output_device_->damage_rect());
     EXPECT_EQ(0u, output_surface_->last_sent_frame()->latency_info.size());
   }
+
+  factory_.Destroy(local_frame_id);
 }
 
 class MockedContext : public TestWebGraphicsContext3D {
@@ -439,6 +442,7 @@
   display_->SetLocalFrameId(local_frame_id, 1.f);
 
   display_->Resize(gfx::Size(100, 100));
+  factory_.Create(local_frame_id);
 
   {
     RenderPassList pass_list;
@@ -484,6 +488,8 @@
   EXPECT_CALL(*context_ptr, shallowFinishCHROMIUM());
   display_->Resize(gfx::Size(250, 250));
   testing::Mock::VerifyAndClearExpectations(context_ptr);
+
+  factory_.Destroy(local_frame_id);
 }
 
 class CountLossDisplayClient : public StubDisplayClient {