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

ui/android/delegated_frame_host_android.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 "ui/android/delegated_frame_host_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/surface_layer.h"
@@ skipping 111 matching lines @@
           frame.metadata.bottom_controls_shown_ratio ||
       current_frame_->viewport_selection != frame.metadata.selection ||
       current_frame_->has_transparent_background !=
           root_pass->has_transparent_background) {
     DestroyDelegatedContent();
     DCHECK(!content_layer_);
     DCHECK(!current_frame_);
 
     current_frame_ = base::MakeUnique<FrameData>();
     current_frame_->local_frame_id = surface_id_allocator_->GenerateId();
+    surface_factory_->Create(current_frame_->local_frame_id);
 
     current_frame_->surface_size = surface_size;
     current_frame_->top_controls_height = frame.metadata.top_controls_height;
     current_frame_->top_controls_shown_ratio =
         frame.metadata.top_controls_shown_ratio;
     current_frame_->bottom_controls_height =
         frame.metadata.bottom_controls_height;
     current_frame_->bottom_controls_shown_ratio =
         frame.metadata.bottom_controls_shown_ratio;
     current_frame_->has_transparent_background =
@@ skipping 42 matching lines @@
 }
 
 void DelegatedFrameHostAndroid::DestroyDelegatedContent() {
   if (!current_frame_)
     return;
 
   DCHECK(content_layer_);
 
   content_layer_->RemoveFromParent();
   content_layer_ = nullptr;
-  surface_factory_->EvictSurface();
+  surface_factory_->Destroy(current_frame_->local_frame_id);
   current_frame_.reset();
 
   UpdateBackgroundLayer();
 }
 
 bool DelegatedFrameHostAndroid::HasDelegatedContent() const {
   return current_frame_.get() != nullptr;
 }
 
 void DelegatedFrameHostAndroid::CompositorFrameSinkChanged() {
@@ skipping 57 matching lines @@
         content_size_in_dip.width() < container_size_in_dip_.width() ||
         content_size_in_dip.height() < container_size_in_dip_.height();
   } else {
     background_is_drawable = true;
   }
 
   background_layer_->SetIsDrawable(background_is_drawable);
 }
 
 }  // namespace ui