Remove usage of base::make_span(): pdf/

Replace with span() CTAD use, or more targeted helpers.

Bug: 341907909
Change-Id: I9743673cf6b55c09385959c223e1152db3276255
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6058368
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: K. Moon <kmoon@chromium.org>
Commit-Queue: K. Moon <kmoon@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1389473}

pdf/loader/document_loader_impl.cc

@@ -336,7 +336,7 @@ bool DocumentLoaderImpl::SaveBuffer(uint32_t input_size) {
   bytes_received_ += input_size;
   bool chunk_saved = false;
   bool loading_pending_request = pending_requests_.Contains(chunk_.chunk_index);
-  auto input = base::make_span(buffer_).first(input_size);
+  auto input = base::span(buffer_).first(input_size);
   while (!input.empty()) {
     if (chunk_.data_size == 0)
       chunk_.chunk_data = std::make_unique<DataStream::ChunkData>();

pdf/pdf_ink_module_unittest.cc

@@ -1733,8 +1733,7 @@ TEST_F(PdfInkModuleUndoRedoTest, UndoRedoBetweenDraws) {
       ElementsAre(kMouseDownPoint1, kMouseMovePoint1, kMouseUpPoint1),
       ElementsAre(kMouseDownPoint2, kMouseMovePoint2, kMouseUpPoint2),
       ElementsAre(kMouseDownPoint3, kMouseMovePoint3, kMouseUpPoint3)};
-  const auto kInitial4StrokeMatchersSpan =
-      base::make_span(kInitial4StrokeMatchers);
+  const auto kInitial4StrokeMatchersSpan = base::span(kInitial4StrokeMatchers);
   EXPECT_THAT(
       StrokeInputPositions(),
       ElementsAre(Pair(0, ElementsAreArray(kInitial4StrokeMatchersSpan))));
@@ -1776,7 +1775,7 @@ TEST_F(PdfInkModuleUndoRedoTest, UndoRedoBetweenDraws) {
       ElementsAre(kMouseDownPoint, kMouseMovePoint, kMouseUpPoint),
       ElementsAre(kMouseDownPoint1, kMouseMovePoint1, kMouseUpPoint1),
       ElementsAre(kMouseDownPoint3, kMouseMovePoint3, kMouseUpPoint3)};
-  const auto kNext3StrokeMatchersSpan = base::make_span(kNext3StrokeMatchers);
+  const auto kNext3StrokeMatchersSpan = base::span(kNext3StrokeMatchers);
   EXPECT_THAT(StrokeInputPositions(),
               ElementsAre(Pair(0, ElementsAreArray(kNext3StrokeMatchersSpan))));
   EXPECT_THAT(VisibleStrokeInputPositions(),
@@ -1968,8 +1967,7 @@ TEST_F(PdfInkModuleUndoRedoTest, StrokeStrokeUndoStroke) {
   const auto kInitialStrokeMatchers = {
       ElementsAre(kMouseDownPoint, kMouseMovePoint, kMouseUpPoint),
       ElementsAre(kMouseDownPoint2, kMouseMovePoint2, kMouseUpPoint2)};
-  const auto kInitialStrokeMatchersSpan =
-      base::make_span(kInitialStrokeMatchers);
+  const auto kInitialStrokeMatchersSpan = base::span(kInitialStrokeMatchers);
   EXPECT_THAT(
       StrokeInputPositions(),
       ElementsAre(Pair(0, ElementsAreArray(kInitialStrokeMatchersSpan))));
@@ -2000,7 +1998,7 @@ TEST_F(PdfInkModuleUndoRedoTest, StrokeStrokeUndoStroke) {
   const auto kNextStrokeMatchers = {
       ElementsAre(kMouseDownPoint, kMouseMovePoint, kMouseUpPoint),
       ElementsAre(kMouseDownPoint3, kMouseMovePoint3, kMouseUpPoint3)};
-  const auto kNextStrokeMatchersSpan = base::make_span(kNextStrokeMatchers);
+  const auto kNextStrokeMatchersSpan = base::span(kNextStrokeMatchers);
   EXPECT_THAT(StrokeInputPositions(),
               ElementsAre(Pair(0, ElementsAreArray(kNextStrokeMatchersSpan))));
   EXPECT_THAT(VisibleStrokeInputPositions(),

pdf/pdf_view_web_plugin_unittest.cc

@@ -2046,8 +2046,7 @@ TEST_F(PdfViewWebPluginSaveTest, AnnotationInNonEditMode) {
     "fileName": "example.pdf",
     "editModeForTesting": false,
   })");
-  AddDataToValue(base::make_span(TestPDFiumEngine::kLoadedData),
-                 expected_response);
+  AddDataToValue(base::span(TestPDFiumEngine::kLoadedData), expected_response);
 
   EXPECT_CALL(pdf_host_, SetPluginCanSave(true));
   ExpectUpdateTextInputState(blink::WebTextInputType::kWebTextInputTypeNone);
@@ -2073,8 +2072,7 @@ TEST_F(PdfViewWebPluginSaveTest, AnnotationInEditMode) {
     "fileName": "example.pdf",
     "editModeForTesting": true,
   })");
-  AddDataToValue(base::make_span(TestPDFiumEngine::kSaveData),
-                 expected_response);
+  AddDataToValue(base::span(TestPDFiumEngine::kSaveData), expected_response);
 
   ExpectUpdateTextInputState(blink::WebTextInputType::kWebTextInputTypeNone);
   EXPECT_CALL(*client_ptr_, PostMessage(base::test::IsJson(expected_response)));
@@ -2148,8 +2146,7 @@ TEST_F(PdfViewWebPluginSaveTest, EditedInNonEditMode) {
     "fileName": "example.pdf",
     "editModeForTesting": false,
   })");
-  AddDataToValue(base::make_span(TestPDFiumEngine::kLoadedData),
-                 expected_response);
+  AddDataToValue(base::span(TestPDFiumEngine::kLoadedData), expected_response);
 
   ExpectUpdateTextInputState(blink::WebTextInputType::kWebTextInputTypeNone);
   EXPECT_CALL(*client_ptr_, PostMessage(base::test::IsJson(expected_response)));
@@ -2171,8 +2168,7 @@ TEST_F(PdfViewWebPluginSaveTest, EditedInEditMode) {
     "fileName": "example.pdf",
     "editModeForTesting": true,
   })");
-  AddDataToValue(base::make_span(TestPDFiumEngine::kSaveData),
-                 expected_response);
+  AddDataToValue(base::span(TestPDFiumEngine::kSaveData), expected_response);
 
   ExpectUpdateTextInputState(blink::WebTextInputType::kWebTextInputTypeNone);
   EXPECT_CALL(*client_ptr_, PostMessage(base::test::IsJson(expected_response)));
@@ -2905,8 +2901,7 @@ TEST_F(PdfViewWebPluginInk2SaveTest, AnnotationInNonEditMode) {
     "fileName": "example.pdf",
     "editModeForTesting": false,
   })");
-  AddDataToValue(base::make_span(TestPDFiumEngine::kSaveData),
-                 expected_response);
+  AddDataToValue(base::span(TestPDFiumEngine::kSaveData), expected_response);
 
   ExpectUpdateTextInputState(blink::WebTextInputType::kWebTextInputTypeNone);
   EXPECT_CALL(*client_ptr_, PostMessage(base::test::IsJson(expected_response)));
@@ -2932,8 +2927,7 @@ TEST_F(PdfViewWebPluginInk2SaveTest, AnnotationInEditMode) {
     "fileName": "example.pdf",
     "editModeForTesting": true,
   })");
-  AddDataToValue(base::make_span(TestPDFiumEngine::kSaveData),
-                 expected_response);
+  AddDataToValue(base::span(TestPDFiumEngine::kSaveData), expected_response);
 
   ExpectUpdateTextInputState(blink::WebTextInputType::kWebTextInputTypeNone);
   EXPECT_CALL(*client_ptr_, PostMessage(base::test::IsJson(expected_response)));

pdf/pdfium/pdfium_engine_exports_unittest.cc

@@ -183,8 +183,7 @@ TEST_F(PDFiumEngineExportsTest, ConvertPdfPagesToNupPdf) {
       pdf_buffers, 2, gfx::Size(612, 792), gfx::Rect(22, 20, 570, 750));
   ASSERT_GT(output_pdf_buffer.size(), 0U);
 
-  base::span<const uint8_t> output_pdf_span =
-      base::make_span(output_pdf_buffer);
+  base::span<const uint8_t> output_pdf_span = base::span(output_pdf_buffer);
   int page_count;
   ASSERT_TRUE(GetPDFDocInfo(output_pdf_span, &page_count, nullptr));
   ASSERT_EQ(1, page_count);
@@ -210,8 +209,7 @@ TEST_F(PDFiumEngineExportsTest, ConvertPdfDocumentToNupPdf) {
       pdf_data.value(), 4, gfx::Size(612, 792), gfx::Rect(22, 20, 570, 750));
   ASSERT_GT(output_pdf_buffer.size(), 0U);
 
-  base::span<const uint8_t> output_pdf_span =
-      base::make_span(output_pdf_buffer);
+  base::span<const uint8_t> output_pdf_span = base::span(output_pdf_buffer);
   int page_count;
   ASSERT_TRUE(GetPDFDocInfo(output_pdf_span, &page_count, nullptr));
   ASSERT_EQ(2, page_count);

pdf/test/test_document_loader.cc

@@ -89,9 +89,8 @@ bool TestDocumentLoader::GetBlock(uint32_t position,
     return false;
 
   // TODO(crbug.com/40284755): spanify function signature to fix the errors.
-  auto dest_span =
-      UNSAFE_TODO(base::make_span(static_cast<uint8_t*>(buf), size));
-  dest_span.copy_from(base::make_span(pdf_data_).subspan(position, size));
+  auto dest_span = UNSAFE_TODO(base::span(static_cast<uint8_t*>(buf), size));
+  dest_span.copy_from(base::span(pdf_data_).subspan(position, size));
   return true;
 }