mus: Use ui::ContextProviderCommandBuffer.

ui/views/mus/surface_context_factory.cc

Index: ui/views/mus/surface_context_factory.cc
diff --git a/ui/views/mus/surface_context_factory.cc b/ui/views/mus/surface_context_factory.cc
index 4b55ac1ed06b34bf4a7f4340616ec67d03c0c356..9a881ee884f9055cf1a3a7db2bf46215967c5217 100644
--- a/ui/views/mus/surface_context_factory.cc
+++ b/ui/views/mus/surface_context_factory.cc
@@ -7,7 +7,6 @@
 #include "base/memory/ptr_util.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
-#include "services/ui/public/cpp/context_provider.h"
 #include "services/ui/public/cpp/gpu/gpu.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_compositor_frame_sink.h"
@@ -28,8 +27,8 @@ void SurfaceContextFactory::CreateCompositorFrameSink(
   ui::mojom::CompositorFrameSinkType compositor_frame_sink_type =
       native_widget->compositor_frame_sink_type();
   auto compositor_frame_sink = window->RequestCompositorFrameSink(
-      compositor_frame_sink_type, make_scoped_refptr(new ui::ContextProvider(
-                                      gpu_->EstablishGpuChannelSync())),
+      compositor_frame_sink_type,
+      gpu_->CreateContextProvider(gpu_->EstablishGpuChannelSync()),
       gpu_->gpu_memory_buffer_manager());
   compositor->SetCompositorFrameSink(std::move(compositor_frame_sink));
 }