Delete printing::CreateReadOnlySharedMemoryRegion().

mojo::CreateReadOnlySharedMemoryRegion() just got added.

Change-Id: Ic247f391e041d9d7f401d73c34b3f005bb000347
Reviewed-on: https://chromium-review.googlesource.com/1187238
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Matthew Cary <mattcary@chromium.org>
Reviewed-by: Wei Li <weili@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585629}

chrome/services/printing/pdf_nup_converter.cc

@@ -10,7 +10,7 @@
 #include "base/containers/span.h"
 #include "base/logging.h"
 #include "components/crash/core/common/crash_key.h"
-#include "components/services/pdf_compositor/public/cpp/pdf_service_mojo_utils.h"
+#include "mojo/public/cpp/base/shared_memory_utils.h"
 #include "pdf/pdf.h"
 
 namespace printing {
@@ -64,7 +64,8 @@ void PdfNupConverter::NupPageConvert(
     return;
   }
 
-  region_mapping = CreateReadOnlySharedMemoryRegion(output_pdf_buffer_size);
+  region_mapping =
+      mojo::CreateReadOnlySharedMemoryRegion(output_pdf_buffer_size);
   memcpy(region_mapping.mapping.memory(), output_pdf_buffer,
          output_pdf_buffer_size);
   free(output_pdf_buffer);
@@ -92,7 +93,8 @@ void PdfNupConverter::NupDocumentConvert(
     return;
   }
 
-  region_mapping = CreateReadOnlySharedMemoryRegion(output_pdf_buffer_size);
+  region_mapping =
+      mojo::CreateReadOnlySharedMemoryRegion(output_pdf_buffer_size);
   memcpy(region_mapping.mapping.memory(), output_pdf_buffer,
          output_pdf_buffer_size);
   free(output_pdf_buffer);

chrome/services/printing/pdf_to_emf_converter.cc

@@ -11,7 +11,7 @@
 #include "base/containers/span.h"
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
-#include "components/services/pdf_compositor/public/cpp/pdf_service_mojo_utils.h"
+#include "mojo/public/cpp/base/shared_memory_utils.h"
 #include "pdf/pdf.h"
 #include "printing/emf_win.h"
 #include "ui/gfx/gdi_util.h"
@@ -170,7 +170,7 @@ base::ReadOnlySharedMemoryRegion PdfToEmfConverter::RenderPdfPageToMetafile(
 
   const uint32_t size = metafile.GetDataSize();
   base::MappedReadOnlyRegion region_mapping =
-      CreateReadOnlySharedMemoryRegion(size);
+      mojo::CreateReadOnlySharedMemoryRegion(size);
   if (!region_mapping.IsValid())
     return invalid_emf_region;
 

chrome/services/printing/pdf_to_pwg_raster_converter.cc

@@ -11,7 +11,7 @@
 #include "base/containers/span.h"
 #include "components/pwg_encoder/bitmap_image.h"
 #include "components/pwg_encoder/pwg_encoder.h"
-#include "components/services/pdf_compositor/public/cpp/pdf_service_mojo_utils.h"
+#include "mojo/public/cpp/base/shared_memory_utils.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "pdf/pdf.h"
 #include "printing/pdf_render_settings.h"
@@ -101,7 +101,7 @@ base::ReadOnlySharedMemoryRegion RenderPdfPagesToPwgRaster(
   }
 
   base::MappedReadOnlyRegion region_mapping =
-      CreateReadOnlySharedMemoryRegion(pwg_data.size());
+      mojo::CreateReadOnlySharedMemoryRegion(pwg_data.size());
   if (!region_mapping.IsValid())
     return invalid_pwg_region;
 

components/services/pdf_compositor/pdf_compositor_impl.cc

@@ -14,6 +14,7 @@
 #include "components/crash/core/common/crash_key.h"
 #include "components/services/pdf_compositor/public/cpp/pdf_service_mojo_types.h"
 #include "components/services/pdf_compositor/public/cpp/pdf_service_mojo_utils.h"
+#include "mojo/public/cpp/base/shared_memory_utils.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "printing/common/metafile_utils.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -226,7 +227,7 @@ mojom::PdfCompositor::Status PdfCompositorImpl::CompositeToPdf(
   doc->close();
 
   base::MappedReadOnlyRegion region_mapping =
-      CreateReadOnlySharedMemoryRegion(wstream.bytesWritten());
+      mojo::CreateReadOnlySharedMemoryRegion(wstream.bytesWritten());
   if (!region_mapping.IsValid()) {
     DLOG(ERROR) << "CompositeToPdf: Cannot create new shared memory region.";
     return mojom::PdfCompositor::Status::HANDLE_MAP_ERROR;

components/services/pdf_compositor/public/cpp/pdf_service_mojo_utils.cc

@@ -7,26 +7,10 @@
 #include <utility>
 
 #include "base/memory/shared_memory.h"
-#include "base/memory/writable_shared_memory_region.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 
 namespace printing {
 
-base::MappedReadOnlyRegion CreateReadOnlySharedMemoryRegion(size_t size) {
-  mojo::ScopedSharedBufferHandle handle =
-      mojo::SharedBufferHandle::Create(size);
-  base::WritableSharedMemoryRegion writable_region =
-      UnwrapWritableSharedMemoryRegion(std::move(handle));
-  base::WritableSharedMemoryMapping mapping = writable_region.Map();
-  if (!mapping.IsValid())
-    return {};
-
-  base::ReadOnlySharedMemoryRegion readonly_region =
-      base::WritableSharedMemoryRegion::ConvertToReadOnly(
-          std::move(writable_region));
-  return {std::move(readonly_region), std::move(mapping)};
-}
-
 std::unique_ptr<base::SharedMemory> GetShmFromMojoHandle(
     mojo::ScopedSharedBufferHandle handle) {
   base::SharedMemoryHandle memory_handle;

components/services/pdf_compositor/public/cpp/pdf_service_mojo_utils.h

@@ -7,7 +7,6 @@
 
 #include <memory>
 
-#include "base/memory/read_only_shared_memory_region.h"
 #include "mojo/public/cpp/system/buffer.h"
 
 namespace base {
@@ -16,10 +15,6 @@ class SharedMemory;
 
 namespace printing {
 
-// Similar to base::ReadOnlySharedMemoryRegion::Create(), except it works inside
-// sandboxed environments.
-base::MappedReadOnlyRegion CreateReadOnlySharedMemoryRegion(size_t size);
-
 std::unique_ptr<base::SharedMemory> GetShmFromMojoHandle(
     mojo::ScopedSharedBufferHandle handle);