DirectCompositorFrameSink Uses CompositorFrameSinkSupport

ui/android/delegated_frame_host_android.cc

Index: ui/android/delegated_frame_host_android.cc
diff --git a/ui/android/delegated_frame_host_android.cc b/ui/android/delegated_frame_host_android.cc
index 88cc36ae52716271d05a483843965064b1711c37..30c6df3c35c57abb690a9adb54e9c8f10d6beb14 100644
--- a/ui/android/delegated_frame_host_android.cc
+++ b/ui/android/delegated_frame_host_android.cc
@@ -67,6 +67,7 @@ DelegatedFrameHostAndroid::DelegatedFrameHostAndroid(
       ui::ContextProviderFactory::GetInstance()->GetSurfaceManager();
   surface_id_allocator_.reset(new cc::SurfaceIdAllocator());
   surface_manager_->RegisterFrameSinkId(frame_sink_id_);
+  surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   surface_factory_ = base::WrapUnique(
       new cc::SurfaceFactory(frame_sink_id_, surface_manager_, this));
 
@@ -78,7 +79,7 @@ DelegatedFrameHostAndroid::DelegatedFrameHostAndroid(
 DelegatedFrameHostAndroid::~DelegatedFrameHostAndroid() {
   DestroyDelegatedContent();
   surface_factory_.reset();
-  UnregisterFrameSinkHierarchy();
+  surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
   surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
   background_layer_->RemoveFromParent();
 }
@@ -203,24 +204,6 @@ void DelegatedFrameHostAndroid::UpdateContainerSizeinDIP(
   UpdateBackgroundLayer();
 }
 
-void DelegatedFrameHostAndroid::RegisterFrameSinkHierarchy(
-    const cc::FrameSinkId& parent_id) {
-  if (registered_parent_frame_sink_id_.is_valid())
-    UnregisterFrameSinkHierarchy();
-  registered_parent_frame_sink_id_ = parent_id;
-  surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
-  surface_manager_->RegisterFrameSinkHierarchy(parent_id, frame_sink_id_);
-}
-
-void DelegatedFrameHostAndroid::UnregisterFrameSinkHierarchy() {
-  if (!registered_parent_frame_sink_id_.is_valid())
-    return;
-  surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
-  surface_manager_->UnregisterFrameSinkHierarchy(
-      registered_parent_frame_sink_id_, frame_sink_id_);
-  registered_parent_frame_sink_id_ = cc::FrameSinkId();
-}
-
 void DelegatedFrameHostAndroid::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   client_->ReturnResources(resources);