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

content/renderer/android/synchronous_compositor_frame_sink.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_
 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 128 matching lines @@
     void DisplayWillDrawAndSwap(
         bool will_draw_and_swap,
         const cc::RenderPassList& render_passes) override {}
     void DisplayDidDrawAndSwap() override {}
   };
 
   // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface
   // is owned/destroyed on the compositor thread.
   std::unique_ptr<cc::SurfaceManager> surface_manager_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
+  cc::LocalFrameId root_local_frame_id_;
   cc::LocalFrameId child_local_frame_id_;
-  cc::LocalFrameId root_local_frame_id_;
   // Uses surface_manager_.
-  std::unique_ptr<cc::SurfaceFactory> root_factory_;
-  std::unique_ptr<cc::SurfaceFactory> child_factory_;
+  std::unique_ptr<cc::SurfaceFactory> surface_factory_;
   StubDisplayClient display_client_;
   // Uses surface_manager_.
   std::unique_ptr<cc::Display> display_;
   // Owned by |display_|.
   SoftwareOutputSurface* software_output_surface_ = nullptr;
   std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
 
   gfx::Rect sw_viewport_for_current_draw_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorFrameSink);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_