Switching to CompositorFrameSinkSupport in android_webview::SurfacesInstance

android_webview/browser/surfaces_instance.h

Index: android_webview/browser/surfaces_instance.h
diff --git a/android_webview/browser/surfaces_instance.h b/android_webview/browser/surfaces_instance.h
index 9ed6557dc63a32c0a1a954a3e12ba02ad0f025d6..4ae3cc4f63e49d06a1b954ef6cd88fd554553b42 100644
--- a/android_webview/browser/surfaces_instance.h
+++ b/android_webview/browser/surfaces_instance.h
@@ -15,9 +15,8 @@
 #include "cc/surfaces/surface_id.h"
 
 namespace cc {
-class Display;
+class CompositorFrameSinkSupport;
 class SurfaceIdAllocator;
-class SurfaceFactory;
 class SurfaceManager;
 }
 
@@ -73,10 +72,8 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
   cc::FrameSinkId frame_sink_id_;
 
   std::unique_ptr<cc::SurfaceManager> surface_manager_;
-  std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
-  std::unique_ptr<cc::Display> display_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
-  std::unique_ptr<cc::SurfaceFactory> surface_factory_;
+  std::unique_ptr<cc::CompositorFrameSinkSupport> support_;
 
   cc::LocalFrameId root_id_;
   std::vector<cc::SurfaceId> child_ids_;