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

content/renderer/android/synchronous_compositor_frame_sink.h

Index: content/renderer/android/synchronous_compositor_frame_sink.h
diff --git a/content/renderer/android/synchronous_compositor_frame_sink.h b/content/renderer/android/synchronous_compositor_frame_sink.h
index a9a273bbbabd0b6b48fbcb9b95377ab8c7c56188..f5e56b9ca4a5ee9bfdd3d1c0574b20183c888686 100644
--- a/content/renderer/android/synchronous_compositor_frame_sink.h
+++ b/content/renderer/android/synchronous_compositor_frame_sink.h
@@ -146,11 +146,10 @@
   // 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_;