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

cc/surfaces/surface_unittest.cc

 // Copyright 2014 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 "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/scheduler_test_common.h"
@@ skipping 22 matching lines @@
 };
 
 TEST(SurfaceTest, SurfaceLifetime) {
   SurfaceManager manager;
   FakeSurfaceFactoryClient surface_factory_client;
   SurfaceFactory factory(kArbitraryFrameSinkId, &manager,
                          &surface_factory_client);
 
   LocalFrameId local_frame_id(6, base::UnguessableToken::Create());
   SurfaceId surface_id(kArbitraryFrameSinkId, local_frame_id);
-  factory.SubmitCompositorFrame(local_frame_id, CompositorFrame(),
-                                SurfaceFactory::DrawCallback());
-  EXPECT_TRUE(manager.GetSurfaceForId(surface_id));
-  factory.EvictSurface();
+  {
+    factory.Create(local_frame_id);
+    EXPECT_TRUE(manager.GetSurfaceForId(surface_id));
+    factory.Destroy(local_frame_id);
+  }
 
   EXPECT_EQ(NULL, manager.GetSurfaceForId(surface_id));
 }
 
 TEST(SurfaceTest, SurfaceIds) {
   for (size_t i = 0; i < 3; ++i) {
     SurfaceIdAllocator allocator;
     LocalFrameId id1 = allocator.GenerateId();
     LocalFrameId id2 = allocator.GenerateId();
     EXPECT_NE(id1, id2);
   }
 }
 
 }  // namespace
 }  // namespace cc