diff --git a/components/viz/service/display_embedder/output_presenter.cc b/components/viz/service/display_embedder/output_presenter.cc
index 240c7d442a8ca..da9bebd756781 100644
--- a/components/viz/service/display_embedder/output_presenter.cc
+++ b/components/viz/service/display_embedder/output_presenter.cc
@@ -85,12 +85,10 @@ void OutputPresenter::Image::EndWriteSkia() {
   DCHECK(scoped_skia_write_access_);
   if (!end_semaphores_.empty()) {
     GrFlushInfo flush_info = {
-        .fFlags = kNone_GrFlushFlags,
         .fNumSemaphores = end_semaphores_.size(),
         .fSignalSemaphores = end_semaphores_.data(),
     };
-    scoped_skia_write_access_->surface()->flush(
-        SkSurface::BackendSurfaceAccess::kNoAccess, flush_info);
+    scoped_skia_write_access_->surface()->flush(flush_info);
     DCHECK(scoped_skia_write_access_->surface()->getContext());
     scoped_skia_write_access_->surface()->getContext()->submit();
   }
diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
index d4f1e7823dbfe..e622bc1af8f61 100644
--- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
+++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
@@ -972,7 +972,6 @@ bool SkiaOutputSurfaceImplOnGpu::FinishPaintCurrentFrame(
                           end_paint_semaphores.end());
 
     GrFlushInfo flush_info = {
-        .fFlags = kNone_GrFlushFlags,
         .fNumSemaphores = end_semaphores.size(),
         .fSignalSemaphores = end_semaphores.data(),
     };
@@ -1131,14 +1130,12 @@ void SkiaOutputSurfaceImplOnGpu::FinishPaintRenderPass(
     destroy_after_swap_.emplace_back(std::move(ddl));
 
     GrFlushInfo flush_info = {
-        .fFlags = kNone_GrFlushFlags,
         .fNumSemaphores = end_semaphores.size(),
         .fSignalSemaphores = end_semaphores.data(),
     };
     gpu::AddVulkanCleanupTaskForSkiaFlush(vulkan_context_provider_,
                                           &flush_info);
-    auto result = offscreen.surface()->flush(
-        SkSurface::BackendSurfaceAccess::kNoAccess, flush_info);
+    auto result = offscreen.surface()->flush(flush_info);
     if (result != GrSemaphoresSubmitted::kYes &&
         !(begin_semaphores.empty() && end_semaphores.empty())) {
       // TODO(penghuang): handle vulkan device lost.
@@ -1248,11 +1245,11 @@ bool SkiaOutputSurfaceImplOnGpu::CopyOutput(
     surface->getCanvas()->drawPaint(paint);
     gl::ScopedProgressReporter scoped_progress_reporter(
         context_state_->progress_reporter());
-    surface->flush(SkSurface::BackendSurfaceAccess::kNoAccess, {});
+    surface->flush();
   }
 
   if (use_gl_renderer_copier_) {
-    surface->flush(SkSurface::BackendSurfaceAccess::kNoAccess, {});
+    surface->flush();
 
     GLuint gl_id = 0;
     GLenum internal_format = supports_alpha_ ? GL_RGBA : GL_RGB;
diff --git a/gpu/command_buffer/service/raster_decoder.cc b/gpu/command_buffer/service/raster_decoder.cc
index 82c4de81acd64..ebe1640475970 100644
--- a/gpu/command_buffer/service/raster_decoder.cc
+++ b/gpu/command_buffer/service/raster_decoder.cc
@@ -848,7 +848,6 @@ void RasterDecoderImpl::Destroy(bool have_context) {
     // Make sure we flush any pending skia work on this context.
     if (sk_surface_) {
       GrFlushInfo flush_info = {
-          .fFlags = kNone_GrFlushFlags,
           .fNumSemaphores = end_semaphores_.size(),
           .fSignalSemaphores = end_semaphores_.data(),
       };
@@ -2215,14 +2214,12 @@ void RasterDecoderImpl::DoCopySubTextureINTERNALSkia(
   // so the begin_semaphores can be released, and end_semaphores can be
   // signalled.
   GrFlushInfo flush_info = {
-      .fFlags = kNone_GrFlushFlags,
       .fNumSemaphores = end_semaphores.size(),
       .fSignalSemaphores = end_semaphores.data(),
   };
   gpu::AddVulkanCleanupTaskForSkiaFlush(
       shared_context_state_->vk_context_provider(), &flush_info);
-  auto result = dest_scoped_access->surface()->flush(
-      SkSurface::BackendSurfaceAccess::kNoAccess, flush_info);
+  auto result = dest_scoped_access->surface()->flush(flush_info);
   // If the |end_semaphores| is empty, we can deferred the queue submission.
   if (!end_semaphores.empty()) {
     DCHECK_EQ(result, GrSemaphoresSubmitted::kYes);
@@ -2349,14 +2346,12 @@ void RasterDecoderImpl::DoWritePixelsINTERNAL(GLint x_offset,
   }
 
   GrFlushInfo flush_info = {
-      .fFlags = kNone_GrFlushFlags,
       .fNumSemaphores = end_semaphores.size(),
       .fSignalSemaphores = end_semaphores.data(),
   };
   gpu::AddVulkanCleanupTaskForSkiaFlush(
       shared_context_state_->vk_context_provider(), &flush_info);
-  auto result = dest_scoped_access->surface()->flush(
-      SkSurface::BackendSurfaceAccess::kNoAccess, flush_info);
+  auto result = dest_scoped_access->surface()->flush(flush_info);
   if (!end_semaphores.empty()) {
     DCHECK_EQ(result, GrSemaphoresSubmitted::kYes);
     gr_context()->submit();
@@ -2543,14 +2538,12 @@ void RasterDecoderImpl::DoConvertYUVMailboxesToRGBINTERNAL(
   // so the begin_semaphores can be released, and end_semaphores can be
   // signalled.
   GrFlushInfo flush_info = {
-      .fFlags = kNone_GrFlushFlags,
       .fNumSemaphores = end_semaphores.size(),
       .fSignalSemaphores = end_semaphores.data(),
   };
   gpu::AddVulkanCleanupTaskForSkiaFlush(
       shared_context_state_->vk_context_provider(), &flush_info);
-  auto result = dest_scoped_access->surface()->flush(
-      SkSurface::BackendSurfaceAccess::kNoAccess, flush_info);
+  auto result = dest_scoped_access->surface()->flush(flush_info);
   if (!end_semaphores.empty()) {
     DCHECK_EQ(result, GrSemaphoresSubmitted::kYes);
     gr_context()->submit();
@@ -2883,7 +2876,6 @@ void RasterDecoderImpl::DoEndRasterCHROMIUM() {
     gl::ScopedProgressReporter report_progress(
         shared_context_state_->progress_reporter());
     GrFlushInfo flush_info = {
-        .fFlags = kNone_GrFlushFlags,
         .fNumSemaphores = end_semaphores_.size(),
         .fSignalSemaphores = end_semaphores_.data(),
     };
diff --git a/gpu/vulkan/demo/vulkan_demo.cc b/gpu/vulkan/demo/vulkan_demo.cc
index b8dc416e5170b..3ff4cb661184e 100644
--- a/gpu/vulkan/demo/vulkan_demo.cc
+++ b/gpu/vulkan/demo/vulkan_demo.cc
@@ -199,7 +199,6 @@ void VulkanDemo::RenderFrame() {
   GrBackendSemaphore semaphore;
   semaphore.initVulkan(scoped_write_->GetEndSemaphore());
   GrFlushInfo flush_info = {
-      .fFlags = kNone_GrFlushFlags,
       .fNumSemaphores = 1,
       .fSignalSemaphores = &semaphore,
   };