1 files changed, 11 insertions, 12 deletions
diff --git a/chromium/ui/compositor/host/host_context_factory_private.cc b/chromium/ui/compositor/host/host_context_factory_private.cc
index e16c5490bbc..8297e1aabe3 100644
--- a/chromium/ui/compositor/host/host_context_factory_private.cc
+++ b/chromium/ui/compositor/host/host_context_factory_private.cc
@@ -78,9 +78,10 @@ void HostContextFactoryPrivate::ConfigureCompositor(
 
   // Initialize ExternalBeginFrameController client if enabled.
   compositor_data.external_begin_frame_controller_client.reset();
-  if (compositor->external_begin_frames_enabled()) {
+  if (compositor->external_begin_frame_client()) {
     compositor_data.external_begin_frame_controller_client =
-        std::make_unique<ExternalBeginFrameControllerClientImpl>(compositor);
+        std::make_unique<ExternalBeginFrameControllerClientImpl>(
+            compositor->external_begin_frame_client());
     root_params->external_begin_frame_controller =
         compositor_data.external_begin_frame_controller_client
             ->GetControllerRequest();
@@ -116,8 +117,6 @@ void HostContextFactoryPrivate::ConfigureCompositor(
       compositor->context_factory()->GetGpuMemoryBufferManager();
   params.pipes.compositor_frame_sink_associated_info = std::move(sink_info);
   params.pipes.client_request = std::move(client_request);
-  params.local_surface_id_provider =
-      std::make_unique<viz::DefaultLocalSurfaceIdProvider>();
   params.enable_surface_synchronization = true;
   if (features::IsVizHitTestingDrawQuadEnabled()) {
     params.hit_test_data_provider =
@@ -141,6 +140,14 @@ void HostContextFactoryPrivate::UnconfigureCompositor(Compositor* compositor) {
   compositor_data_map_.erase(compositor);
 }
 
+base::flat_set<Compositor*> HostContextFactoryPrivate::GetAllCompositors() {
+  base::flat_set<Compositor*> all_compositors;
+  all_compositors.reserve(compositor_data_map_.size());
+  for (auto& pair : compositor_data_map_)
+    all_compositors.insert(pair.first);
+  return all_compositors;
+}
+
 std::unique_ptr<Reflector> HostContextFactoryPrivate::CreateReflector(
     Compositor* source,
     Layer* target) {
@@ -258,14 +265,6 @@ viz::FrameSinkManagerImpl* HostContextFactoryPrivate::GetFrameSinkManager() {
   return nullptr;
 }
 
-base::flat_set<Compositor*> HostContextFactoryPrivate::GetAllCompositors() {
-  base::flat_set<Compositor*> all_compositors;
-  all_compositors.reserve(compositor_data_map_.size());
-  for (auto& pair : compositor_data_map_)
-    all_compositors.insert(pair.first);
-  return all_compositors;
-}
-
 HostContextFactoryPrivate::CompositorData::CompositorData() = default;
 HostContextFactoryPrivate::CompositorData::CompositorData(
     CompositorData&& other) = default;