Revert "Return pdfium::span<char> from ByteString::GetBuffer()."

This reverts commit 80a6cbe0a427e155de8555bc867af745d10f9777.
Reason for revert: too many abrts in beta branch.

TBR: dsinclair@chromium.org
Bug: 832557, 832978, 832992, 833062, 833097
Change-Id: I7d511dbb224ddc644be96ea2f3770ad6f73debf5
Reviewed-on: https://pdfium-review.googlesource.com/30792
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

1 files changed, 10 insertions, 11 deletions

diff --git a/core/fxcrt/bytestring_unittest.cpp b/core/fxcrt/bytestring_unittest.cpp
index d030535edd..f7e1559af9 100644
--- a/core/fxcrt/bytestring_unittest.cpp
+++ b/core/fxcrt/bytestring_unittest.cpp
@@ -843,23 +843,22 @@ TEST(ByteString, Reserve) {
 }
 
 TEST(ByteString, GetBuffer) {
-  ByteString str1;
   {
-    pdfium::span<char> buffer = str1.GetBuffer(12);
+    ByteString str;
+    char* buffer = str.GetBuffer(12);
     // NOLINTNEXTLINE(runtime/printf)
-    strcpy(buffer.data(), "clams");
+    strcpy(buffer, "clams");
+    str.ReleaseBuffer(str.GetStringLength());
+    EXPECT_EQ("clams", str);
   }
-  str1.ReleaseBuffer(str1.GetStringLength());
-  EXPECT_EQ("clams", str1);
-
-  ByteString str2("cl");
   {
-    pdfium::span<char> buffer = str2.GetBuffer(12);
+    ByteString str("cl");
+    char* buffer = str.GetBuffer(12);
     // NOLINTNEXTLINE(runtime/printf)
-    strcpy(&buffer[2], "ams");
+    strcpy(buffer + 2, "ams");
+    str.ReleaseBuffer(str.GetStringLength());
+    EXPECT_EQ("clams", str);
   }
-  str2.ReleaseBuffer(str2.GetStringLength());
-  EXPECT_EQ("clams", str2);
 }
 
 TEST(ByteString, ReleaseBuffer) {