[headless] Remove unnecessary overloaded methods in PDF utils

This CL replaces calls to base::ReadFileToString() with
base::ReadFileToBytes() which made overloaded variant
of PDFPageBitmap::Render() unnecessary.

Change-Id: Ief6e7fe2b6619e8100167890856d6e84c4d38c57
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5473869
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Auto-Submit: Peter Kvitek <kvitekp@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1291085}

chrome/browser/headless/headless_mode_command_browsertest.cc

@@ -509,12 +509,12 @@ IN_PROC_BROWSER_TEST_F(HeadlessModePrintToPdfCommandBrowserTest,
 
   base::ScopedAllowBlockingForTesting allow_blocking;
 
-  std::string pdf_data;
-  ASSERT_TRUE(base::ReadFileToString(print_to_pdf_filename_, &pdf_data))
-      << print_to_pdf_filename_;
+  std::optional<std::vector<uint8_t>> pdf_data =
+      base::ReadFileToBytes(print_to_pdf_filename_);
+  ASSERT_TRUE(pdf_data.has_value()) << print_to_pdf_filename_;
 
   PDFPageBitmap page_bitmap;
-  ASSERT_TRUE(page_bitmap.Render(pdf_data, /*page_index=*/0));
+  ASSERT_TRUE(page_bitmap.Render(pdf_data.value(), /*page_index=*/0));
 
   // Expect blue rectangle on white background.
   EXPECT_TRUE(page_bitmap.CheckColoredRect(SkColorSetRGB(0x00, 0x00, 0xff),
@@ -540,12 +540,12 @@ IN_PROC_BROWSER_TEST_F(HeadlessModeLazyLoadingPrintToPdfCommandBrowserTest,
 
   base::ScopedAllowBlockingForTesting allow_blocking;
 
-  std::string pdf_data;
-  ASSERT_TRUE(base::ReadFileToString(print_to_pdf_filename_, &pdf_data))
-      << print_to_pdf_filename_;
+  std::optional<std::vector<uint8_t>> pdf_data =
+      base::ReadFileToBytes(print_to_pdf_filename_);
+  ASSERT_TRUE(pdf_data.has_value()) << print_to_pdf_filename_;
 
   PDFPageBitmap page_bitmap;
-  ASSERT_TRUE(page_bitmap.Render(pdf_data, /*page_index=*/4));
+  ASSERT_TRUE(page_bitmap.Render(pdf_data.value(), /*page_index=*/4));
 
   // Expect green rectangle on white background.
   EXPECT_TRUE(page_bitmap.CheckColoredRect(SkColorSetRGB(0x00, 0x64, 0x00),
@@ -594,11 +594,11 @@ IN_PROC_BROWSER_TEST_P(HeadlessModeTaggedPrintToPdfCommandBrowserTest,
 
   base::ScopedAllowBlockingForTesting allow_blocking;
 
-  std::string pdf_data;
-  ASSERT_TRUE(base::ReadFileToString(print_to_pdf_filename_, &pdf_data))
-      << print_to_pdf_filename_;
+  std::optional<std::vector<uint8_t>> pdf_data =
+      base::ReadFileToBytes(print_to_pdf_filename_);
+  ASSERT_TRUE(pdf_data.has_value()) << print_to_pdf_filename_;
 
-  auto pdf_span = base::as_bytes(base::make_span(pdf_data));
+  auto pdf_span = base::as_bytes(base::make_span(pdf_data.value()));
 
   int num_pages;
   ASSERT_TRUE(chrome_pdf::GetPDFDocInfo(pdf_span, &num_pages,

components/headless/test/pdf_utils.cc

@@ -22,12 +22,6 @@ namespace headless {
 PDFPageBitmap::PDFPageBitmap() = default;
 PDFPageBitmap::~PDFPageBitmap() = default;
 
-bool PDFPageBitmap::Render(const std::string& pdf_data, int page_index) {
-  auto pdf_span = base::make_span(
-      reinterpret_cast<const uint8_t*>(pdf_data.data()), pdf_data.size());
-  return Render(pdf_span, page_index);
-}
-
 bool PDFPageBitmap::Render(base::span<const uint8_t> pdf_data, int page_index) {
   std::optional<gfx::SizeF> page_size_in_points =
       chrome_pdf::GetPDFPageSizeByIndex(pdf_data, page_index);

components/headless/test/pdf_utils.h

@@ -25,7 +25,6 @@ class PDFPageBitmap {
   PDFPageBitmap();
   ~PDFPageBitmap();
 
-  bool Render(const std::string& pdf_data, int page_index);
   bool Render(base::span<const uint8_t> pdf_data, int page_index);
 
   uint32_t GetPixelRGB(const gfx::Point& pt) const;

headless/test/headless_command_browsertest.cc

@@ -533,12 +533,12 @@ IN_PROC_BROWSER_TEST_F(HeadlessPrintToPdfCommandBrowserTest, PrintToPdf) {
   ASSERT_TRUE(base::PathExists(print_to_pdf_filename_))
       << print_to_pdf_filename_;
 
-  std::string pdf_data;
-  ASSERT_TRUE(base::ReadFileToString(print_to_pdf_filename_, &pdf_data))
-      << print_to_pdf_filename_;
+  std::optional<std::vector<uint8_t>> pdf_data =
+      base::ReadFileToBytes(print_to_pdf_filename_);
+  ASSERT_TRUE(pdf_data.has_value()) << print_to_pdf_filename_;
 
   PDFPageBitmap page_bitmap;
-  ASSERT_TRUE(page_bitmap.Render(pdf_data, 0));
+  ASSERT_TRUE(page_bitmap.Render(pdf_data.value(), 0));
 
   // Expect blue rectangle on white background.
   EXPECT_TRUE(page_bitmap.CheckColoredRect(0xff0000ff, 0xffffffff));
@@ -568,12 +568,12 @@ IN_PROC_BROWSER_TEST_F(HeadlessPrintToPdfWithBackgroundCommandBrowserTest,
   ASSERT_TRUE(base::PathExists(print_to_pdf_filename_))
       << print_to_pdf_filename_;
 
-  std::string pdf_data;
-  ASSERT_TRUE(base::ReadFileToString(print_to_pdf_filename_, &pdf_data))
-      << print_to_pdf_filename_;
+  std::optional<std::vector<uint8_t>> pdf_data =
+      base::ReadFileToBytes(print_to_pdf_filename_);
+  ASSERT_TRUE(pdf_data.has_value()) << print_to_pdf_filename_;
 
   PDFPageBitmap page_bitmap;
-  ASSERT_TRUE(page_bitmap.Render(pdf_data, 0));
+  ASSERT_TRUE(page_bitmap.Render(pdf_data.value(), 0));
 
   // Expect blue rectangle on red background sans margin.
   EXPECT_TRUE(page_bitmap.CheckColoredRect(0xff0000ff, 0xffff0000, 120));