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

cc/test/test_compositor_frame_sink.cc

 // 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 "cc/test/test_compositor_frame_sink.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "cc/output/begin_frame_args.h"
@@ skipping 93 matching lines @@
   display_->renderer_for_testing()->SetEnlargePassTextureAmountForTesting(
       enlarge_pass_texture_amount_);
   display_->SetVisible(true);
   bound_ = true;
   return true;
 }
 
 void TestCompositorFrameSink::DetachFromClient() {
   // Some tests make BindToClient fail on purpose. ^__^
   if (bound_) {
-    surface_factory_->EvictSurface();
+    if (delegated_local_frame_id_.is_valid())
+      surface_factory_->Destroy(delegated_local_frame_id_);
     surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
     surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
     display_ = nullptr;
     bound_ = false;
   }
   surface_factory_ = nullptr;
   surface_id_allocator_ = nullptr;
   surface_manager_ = nullptr;
   test_client_ = nullptr;
   CompositorFrameSink::DetachFromClient();
 }
 
 void TestCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
   test_client_->DisplayReceivedCompositorFrame(frame);
 
   if (!delegated_local_frame_id_.is_valid()) {
     delegated_local_frame_id_ = surface_id_allocator_->GenerateId();
+    surface_factory_->Create(delegated_local_frame_id_);
   }
   display_->SetLocalFrameId(delegated_local_frame_id_,
                             frame.metadata.device_scale_factor);
 
   gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size();
   display_->Resize(frame_size);
 
   bool synchronous = !display_->has_scheduler();
 
   SurfaceFactory::DrawCallback draw_callback;
   if (!synchronous) {
     // For async draws, we use a callback tell when it is done, but for sync
     // draws we don't need one. Unretained is safe here because the callback
     // will be run when |surface_factory_| is destroyed which is owned by this
     // class.
     draw_callback = base::Bind(&TestCompositorFrameSink::DidDrawCallback,
                                base::Unretained(this));
   }
 
   surface_factory_->SubmitCompositorFrame(delegated_local_frame_id_,
                                           std::move(frame), draw_callback);
 
   for (std::unique_ptr<CopyOutputRequest>& copy_request : copy_requests_) {
-    surface_factory_->RequestCopyOfSurface(std::move(copy_request));
+    surface_factory_->RequestCopyOfSurface(delegated_local_frame_id_,
+                                           std::move(copy_request));
   }
   copy_requests_.clear();
 
   if (synchronous) {
     display_->DrawAndSwap();
     // Post this to get a new stack frame so that we exit this function before
     // calling the client to tell it that it is done.
     task_runner_->PostTask(FROM_HERE,
                            base::Bind(&TestCompositorFrameSink::DidDrawCallback,
                                       weak_ptr_factory_.GetWeakPtr()));
@@ skipping 33 matching lines @@
     bool will_draw_and_swap,
     const RenderPassList& render_passes) {
   test_client_->DisplayWillDrawAndSwap(will_draw_and_swap, render_passes);
 }
 
 void TestCompositorFrameSink::DisplayDidDrawAndSwap() {
   test_client_->DisplayDidDrawAndSwap();
 }
 
 }  // namespace cc