Convert IFX_MemoryStream to CFX_MemoryStream

The CFX_MemoryStream is the only implementation of IFX_MemoryStream.
This CL removes the interfaces and uses CFX_MemoryStream directly.

Change-Id: I2f43fa39e82dafa7673517d214ae15fd2d0df331
Reviewed-on: https://pdfium-review.googlesource.com/4391
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

6 files changed, 265 insertions, 253 deletions

diff --git a/core/fxcrt/cfx_memorystream.cpp b/core/fxcrt/cfx_memorystream.cpp
new file mode 100644
index 0000000000..345b381226
--- /dev/null
+++ b/core/fxcrt/cfx_memorystream.cpp
@@ -0,0 +1,199 @@
+// Copyright 2017 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "core/fxcrt/cfx_memorystream.h"
+
+#include <algorithm>
+
+#include "core/fxcrt/fx_safe_types.h"
+
+namespace {
+
+const int32_t kBlockSize = 64 * 1024;
+
+}  // namespace
+
+CFX_MemoryStream::CFX_MemoryStream(bool bConsecutive)
+    : m_nTotalSize(0),
+      m_nCurSize(0),
+      m_nCurPos(0),
+      m_nGrowSize(kBlockSize),
+      m_dwFlags(Type::kTakeOver | (bConsecutive ? Type::kConsecutive : 0)) {}
+
+CFX_MemoryStream::CFX_MemoryStream(uint8_t* pBuffer,
+                                   size_t nSize,
+                                   bool bTakeOver)
+    : m_nTotalSize(nSize),
+      m_nCurSize(nSize),
+      m_nCurPos(0),
+      m_nGrowSize(kBlockSize),
+      m_dwFlags(Type::kConsecutive | (bTakeOver ? Type::kTakeOver : 0)) {
+  m_Blocks.push_back(pBuffer);
+}
+
+CFX_MemoryStream::~CFX_MemoryStream() {
+  if (m_dwFlags & Type::kTakeOver) {
+    for (uint8_t* pBlock : m_Blocks)
+      FX_Free(pBlock);
+  }
+}
+
+FX_FILESIZE CFX_MemoryStream::GetSize() {
+  return static_cast<FX_FILESIZE>(m_nCurSize);
+}
+
+bool CFX_MemoryStream::IsEOF() {
+  return m_nCurPos >= static_cast<size_t>(GetSize());
+}
+
+FX_FILESIZE CFX_MemoryStream::GetPosition() {
+  return static_cast<FX_FILESIZE>(m_nCurPos);
+}
+
+bool CFX_MemoryStream::Flush() {
+  return true;
+}
+
+bool CFX_MemoryStream::ReadBlock(void* buffer,
+                                 FX_FILESIZE offset,
+                                 size_t size) {
+  if (!buffer || !size || offset < 0)
+    return false;
+
+  FX_SAFE_SIZE_T newPos = size;
+  newPos += offset;
+  if (!newPos.IsValid() || newPos.ValueOrDefault(0) == 0 ||
+      newPos.ValueOrDie() > m_nCurSize) {
+    return false;
+  }
+
+  m_nCurPos = newPos.ValueOrDie();
+  if (m_dwFlags & Type::kConsecutive) {
+    memcpy(buffer, m_Blocks[0] + static_cast<size_t>(offset), size);
+    return true;
+  }
+
+  size_t nStartBlock = static_cast<size_t>(offset) / m_nGrowSize;
+  offset -= static_cast<FX_FILESIZE>(nStartBlock * m_nGrowSize);
+  while (size) {
+    size_t nRead = std::min(size, m_nGrowSize - static_cast<size_t>(offset));
+    memcpy(buffer, m_Blocks[nStartBlock] + offset, nRead);
+    buffer = static_cast<uint8_t*>(buffer) + nRead;
+    size -= nRead;
+    ++nStartBlock;
+    offset = 0;
+  }
+  return true;
+}
+
+size_t CFX_MemoryStream::ReadBlock(void* buffer, size_t size) {
+  if (m_nCurPos >= m_nCurSize)
+    return 0;
+
+  size_t nRead = std::min(size, m_nCurSize - m_nCurPos);
+  if (!ReadBlock(buffer, static_cast<int32_t>(m_nCurPos), nRead))
+    return 0;
+
+  return nRead;
+}
+
+bool CFX_MemoryStream::WriteBlock(const void* buffer,
+                                  FX_FILESIZE offset,
+                                  size_t size) {
+  if (!buffer || !size)
+    return false;
+
+  if (m_dwFlags & Type::kConsecutive) {
+    FX_SAFE_SIZE_T newPos = size;
+    newPos += offset;
+    if (!newPos.IsValid())
+      return false;
+
+    m_nCurPos = newPos.ValueOrDie();
+    if (m_nCurPos > m_nTotalSize) {
+      m_nTotalSize = (m_nCurPos + m_nGrowSize - 1) / m_nGrowSize * m_nGrowSize;
+      if (m_Blocks.empty())
+        m_Blocks.push_back(FX_Alloc(uint8_t, m_nTotalSize));
+      else
+        m_Blocks[0] = FX_Realloc(uint8_t, m_Blocks[0], m_nTotalSize);
+    }
+
+    memcpy(m_Blocks[0] + offset, buffer, size);
+    m_nCurSize = std::max(m_nCurSize, m_nCurPos);
+
+    return true;
+  }
+
+  FX_SAFE_SIZE_T newPos = size;
+  newPos += offset;
+  if (!newPos.IsValid())
+    return false;
+  if (!ExpandBlocks(newPos.ValueOrDie()))
+    return false;
+
+  m_nCurPos = newPos.ValueOrDie();
+  size_t nStartBlock = static_cast<size_t>(offset) / m_nGrowSize;
+  offset -= static_cast<FX_FILESIZE>(nStartBlock * m_nGrowSize);
+  while (size) {
+    size_t nWrite = std::min(size, m_nGrowSize - static_cast<size_t>(offset));
+    memcpy(m_Blocks[nStartBlock] + offset, buffer, nWrite);
+    buffer = static_cast<const uint8_t*>(buffer) + nWrite;
+    size -= nWrite;
+    ++nStartBlock;
+    offset = 0;
+  }
+  return true;
+}
+
+void CFX_MemoryStream::EstimateSize(size_t nInitSize, size_t nGrowSize) {
+  if (m_dwFlags & Type::kConsecutive) {
+    if (m_Blocks.empty()) {
+      m_Blocks.push_back(
+          FX_Alloc(uint8_t, std::max(nInitSize, static_cast<size_t>(4096))));
+    }
+    m_nGrowSize = std::max(nGrowSize, static_cast<size_t>(4096));
+  } else if (m_Blocks.empty()) {
+    m_nGrowSize = std::max(nGrowSize, static_cast<size_t>(4096));
+  }
+}
+
+void CFX_MemoryStream::AttachBuffer(uint8_t* pBuffer, size_t nSize) {
+  if (!(m_dwFlags & Type::kConsecutive))
+    return;
+
+  m_Blocks.clear();
+  m_Blocks.push_back(pBuffer);
+  m_nTotalSize = nSize;
+  m_nCurSize = nSize;
+  m_nCurPos = 0;
+  m_dwFlags = Type::kConsecutive;
+}
+
+void CFX_MemoryStream::DetachBuffer() {
+  if (!(m_dwFlags & Type::kConsecutive))
+    return;
+
+  m_Blocks.clear();
+  m_nTotalSize = 0;
+  m_nCurSize = 0;
+  m_nCurPos = 0;
+  m_dwFlags = Type::kTakeOver;
+}
+
+bool CFX_MemoryStream::ExpandBlocks(size_t size) {
+  m_nCurSize = std::max(m_nCurSize, size);
+  if (size <= m_nTotalSize)
+    return true;
+
+  size = (size - m_nTotalSize + m_nGrowSize - 1) / m_nGrowSize;
+  size_t iCount = m_Blocks.size();
+  m_Blocks.resize(iCount + size);
+  while (size--) {
+    m_Blocks[iCount++] = FX_Alloc(uint8_t, m_nGrowSize);
+    m_nTotalSize += m_nGrowSize;
+  }
+  return true;
+}
diff --git a/core/fxcrt/cfx_memorystream.h b/core/fxcrt/cfx_memorystream.h
new file mode 100644
index 0000000000..2112280237
--- /dev/null
+++ b/core/fxcrt/cfx_memorystream.h
@@ -0,0 +1,56 @@
+// Copyright 2017 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef CORE_FXCRT_CFX_MEMORYSTREAM_H_
+#define CORE_FXCRT_CFX_MEMORYSTREAM_H_
+
+#include <vector>
+
+#include "core/fxcrt/cfx_retain_ptr.h"
+#include "core/fxcrt/fx_stream.h"
+
+class CFX_MemoryStream : public IFX_SeekableStream {
+ public:
+  enum Type { kConsecutive = 1 << 0, kTakeOver = 1 << 1 };
+
+  template <typename T, typename... Args>
+  friend CFX_RetainPtr<T> pdfium::MakeRetain(Args&&... args);
+
+  // IFX_SeekableStream
+  FX_FILESIZE GetSize() override;
+  FX_FILESIZE GetPosition() override;
+  bool IsEOF() override;
+  bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
+  size_t ReadBlock(void* buffer, size_t size) override;
+  bool WriteBlock(const void* buffer, FX_FILESIZE offset, size_t size) override;
+  bool Flush() override;
+
+  bool IsConsecutive() const { return !!(m_dwFlags & Type::kConsecutive); }
+
+  uint8_t* GetBuffer() const {
+    return !m_Blocks.empty() ? m_Blocks.front() : nullptr;
+  }
+
+  void EstimateSize(size_t nInitSize, size_t nGrowSize);
+  void AttachBuffer(uint8_t* pBuffer, size_t nSize);
+  void DetachBuffer();
+
+ private:
+  explicit CFX_MemoryStream(bool bConsecutive);
+  CFX_MemoryStream(uint8_t* pBuffer, size_t nSize, bool bTakeOver);
+  ~CFX_MemoryStream() override;
+
+  bool ExpandBlocks(size_t size);
+
+  std::vector<uint8_t*> m_Blocks;
+  size_t m_nTotalSize;
+  size_t m_nCurSize;
+  size_t m_nCurPos;
+  size_t m_nGrowSize;
+  uint32_t m_dwFlags;
+};
+
+#endif  // CORE_FXCRT_CFX_MEMORYSTREAM_H_
diff --git a/core/fxcrt/cfx_seekablestreamproxy.cpp b/core/fxcrt/cfx_seekablestreamproxy.cpp
index 8be2e0898f..622f56b3ec 100644
--- a/core/fxcrt/cfx_seekablestreamproxy.cpp
+++ b/core/fxcrt/cfx_seekablestreamproxy.cpp
@@ -17,6 +17,7 @@
 #include <utility>
 #include <vector>
 
+#include "core/fxcrt/cfx_memorystream.h"
 #include "core/fxcrt/fx_codepage.h"
 #include "core/fxcrt/fx_extension.h"
 #include "third_party/base/ptr_util.h"
@@ -189,7 +190,9 @@ CFX_SeekableStreamProxy::CFX_SeekableStreamProxy(
 }
 
 CFX_SeekableStreamProxy::CFX_SeekableStreamProxy(uint8_t* data, FX_STRSIZE size)
-    : CFX_SeekableStreamProxy(IFX_MemoryStream::Create(data, size), false) {}
+    : CFX_SeekableStreamProxy(
+          pdfium::MakeRetain<CFX_MemoryStream>(data, size, false),
+          false) {}
 
 CFX_SeekableStreamProxy::~CFX_SeekableStreamProxy() {}
 
diff --git a/core/fxcrt/fx_stream.cpp b/core/fxcrt/fx_stream.cpp
index a0086f269e..2c451c67b8 100644
--- a/core/fxcrt/fx_stream.cpp
+++ b/core/fxcrt/fx_stream.cpp
@@ -14,10 +14,6 @@
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxcrt/ifxcrt_fileaccess.h"
 
-#define FX_MEMSTREAM_BlockSize (64 * 1024)
-#define FX_MEMSTREAM_Consecutive 0x01
-#define FX_MEMSTREAM_TakeOver 0x02
-
 namespace {
 
 class CFX_CRTFileStream final : public IFX_SeekableStream {
@@ -50,222 +46,6 @@ class CFX_CRTFileStream final : public IFX_SeekableStream {
   std::unique_ptr<IFXCRT_FileAccess> m_pFile;
 };
 
-class CFX_MemoryStream final : public IFX_MemoryStream {
- public:
-  template <typename T, typename... Args>
-  friend CFX_RetainPtr<T> pdfium::MakeRetain(Args&&... args);
-
-  // IFX_MemoryStream
-  FX_FILESIZE GetSize() override {
-    return static_cast<FX_FILESIZE>(m_nCurSize);
-  }
-  bool IsEOF() override { return m_nCurPos >= static_cast<size_t>(GetSize()); }
-  FX_FILESIZE GetPosition() override {
-    return static_cast<FX_FILESIZE>(m_nCurPos);
-  }
-  bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
-  size_t ReadBlock(void* buffer, size_t size) override;
-  bool WriteBlock(const void* buffer, FX_FILESIZE offset, size_t size) override;
-  bool Flush() override { return true; }
-  bool IsConsecutive() const override {
-    return !!(m_dwFlags & FX_MEMSTREAM_Consecutive);
-  }
-  void EstimateSize(size_t nInitSize, size_t nGrowSize) override;
-  uint8_t* GetBuffer() const override {
-    return !m_Blocks.empty() ? m_Blocks.front() : nullptr;
-  }
-  void AttachBuffer(uint8_t* pBuffer,
-                    size_t nSize,
-                    bool bTakeOver = false) override;
-  void DetachBuffer() override;
-
- private:
-  explicit CFX_MemoryStream(bool bConsecutive);
-  CFX_MemoryStream(uint8_t* pBuffer, size_t nSize, bool bTakeOver);
-  ~CFX_MemoryStream() override;
-
-  bool ExpandBlocks(size_t size);
-
-  std::vector<uint8_t*> m_Blocks;
-  size_t m_nTotalSize;
-  size_t m_nCurSize;
-  size_t m_nCurPos;
-  size_t m_nGrowSize;
-  uint32_t m_dwFlags;
-};
-
-CFX_MemoryStream::CFX_MemoryStream(bool bConsecutive)
-    : m_nTotalSize(0),
-      m_nCurSize(0),
-      m_nCurPos(0),
-      m_nGrowSize(FX_MEMSTREAM_BlockSize) {
-  m_dwFlags =
-      FX_MEMSTREAM_TakeOver | (bConsecutive ? FX_MEMSTREAM_Consecutive : 0);
-}
-
-CFX_MemoryStream::CFX_MemoryStream(uint8_t* pBuffer,
-                                   size_t nSize,
-                                   bool bTakeOver)
-    : m_nTotalSize(nSize),
-      m_nCurSize(nSize),
-      m_nCurPos(0),
-      m_nGrowSize(FX_MEMSTREAM_BlockSize) {
-  m_Blocks.push_back(pBuffer);
-  m_dwFlags =
-      FX_MEMSTREAM_Consecutive | (bTakeOver ? FX_MEMSTREAM_TakeOver : 0);
-}
-
-CFX_MemoryStream::~CFX_MemoryStream() {
-  if (m_dwFlags & FX_MEMSTREAM_TakeOver) {
-    for (uint8_t* pBlock : m_Blocks)
-      FX_Free(pBlock);
-  }
-}
-
-bool CFX_MemoryStream::ReadBlock(void* buffer,
-                                 FX_FILESIZE offset,
-                                 size_t size) {
-  if (!buffer || !size || offset < 0)
-    return false;
-
-  FX_SAFE_SIZE_T newPos = size;
-  newPos += offset;
-  if (!newPos.IsValid() || newPos.ValueOrDefault(0) == 0 ||
-      newPos.ValueOrDie() > m_nCurSize) {
-    return false;
-  }
-
-  m_nCurPos = newPos.ValueOrDie();
-  if (m_dwFlags & FX_MEMSTREAM_Consecutive) {
-    memcpy(buffer, m_Blocks[0] + static_cast<size_t>(offset), size);
-    return true;
-  }
-
-  size_t nStartBlock = static_cast<size_t>(offset) / m_nGrowSize;
-  offset -= static_cast<FX_FILESIZE>(nStartBlock * m_nGrowSize);
-  while (size) {
-    size_t nRead = std::min(size, m_nGrowSize - static_cast<size_t>(offset));
-    memcpy(buffer, m_Blocks[nStartBlock] + offset, nRead);
-    buffer = static_cast<uint8_t*>(buffer) + nRead;
-    size -= nRead;
-    ++nStartBlock;
-    offset = 0;
-  }
-  return true;
-}
-
-size_t CFX_MemoryStream::ReadBlock(void* buffer, size_t size) {
-  if (m_nCurPos >= m_nCurSize)
-    return 0;
-
-  size_t nRead = std::min(size, m_nCurSize - m_nCurPos);
-  if (!ReadBlock(buffer, static_cast<int32_t>(m_nCurPos), nRead))
-    return 0;
-
-  return nRead;
-}
-
-bool CFX_MemoryStream::WriteBlock(const void* buffer,
-                                  FX_FILESIZE offset,
-                                  size_t size) {
-  if (!buffer || !size)
-    return false;
-
-  if (m_dwFlags & FX_MEMSTREAM_Consecutive) {
-    FX_SAFE_SIZE_T newPos = size;
-    newPos += offset;
-    if (!newPos.IsValid())
-      return false;
-
-    m_nCurPos = newPos.ValueOrDie();
-    if (m_nCurPos > m_nTotalSize) {
-      m_nTotalSize = (m_nCurPos + m_nGrowSize - 1) / m_nGrowSize * m_nGrowSize;
-      if (m_Blocks.empty())
-        m_Blocks.push_back(FX_Alloc(uint8_t, m_nTotalSize));
-      else
-        m_Blocks[0] = FX_Realloc(uint8_t, m_Blocks[0], m_nTotalSize);
-    }
-
-    memcpy(m_Blocks[0] + offset, buffer, size);
-    m_nCurSize = std::max(m_nCurSize, m_nCurPos);
-
-    return true;
-  }
-
-  FX_SAFE_SIZE_T newPos = size;
-  newPos += offset;
-  if (!newPos.IsValid())
-    return false;
-  if (!ExpandBlocks(newPos.ValueOrDie()))
-    return false;
-
-  m_nCurPos = newPos.ValueOrDie();
-  size_t nStartBlock = static_cast<size_t>(offset) / m_nGrowSize;
-  offset -= static_cast<FX_FILESIZE>(nStartBlock * m_nGrowSize);
-  while (size) {
-    size_t nWrite = std::min(size, m_nGrowSize - static_cast<size_t>(offset));
-    memcpy(m_Blocks[nStartBlock] + offset, buffer, nWrite);
-    buffer = static_cast<const uint8_t*>(buffer) + nWrite;
-    size -= nWrite;
-    ++nStartBlock;
-    offset = 0;
-  }
-  return true;
-}
-
-void CFX_MemoryStream::EstimateSize(size_t nInitSize, size_t nGrowSize) {
-  if (m_dwFlags & FX_MEMSTREAM_Consecutive) {
-    if (m_Blocks.empty()) {
-      m_Blocks.push_back(
-          FX_Alloc(uint8_t, std::max(nInitSize, static_cast<size_t>(4096))));
-    }
-    m_nGrowSize = std::max(nGrowSize, static_cast<size_t>(4096));
-  } else if (m_Blocks.empty()) {
-    m_nGrowSize = std::max(nGrowSize, static_cast<size_t>(4096));
-  }
-}
-
-void CFX_MemoryStream::AttachBuffer(uint8_t* pBuffer,
-                                    size_t nSize,
-                                    bool bTakeOver) {
-  if (!(m_dwFlags & FX_MEMSTREAM_Consecutive))
-    return;
-
-  m_Blocks.clear();
-  m_Blocks.push_back(pBuffer);
-  m_nTotalSize = nSize;
-  m_nCurSize = nSize;
-  m_nCurPos = 0;
-  m_dwFlags =
-      FX_MEMSTREAM_Consecutive | (bTakeOver ? FX_MEMSTREAM_TakeOver : 0);
-}
-
-void CFX_MemoryStream::DetachBuffer() {
-  if (!(m_dwFlags & FX_MEMSTREAM_Consecutive))
-    return;
-
-  m_Blocks.clear();
-  m_nTotalSize = 0;
-  m_nCurSize = 0;
-  m_nCurPos = 0;
-  m_dwFlags = FX_MEMSTREAM_TakeOver;
-}
-
-bool CFX_MemoryStream::ExpandBlocks(size_t size) {
-  m_nCurSize = std::max(m_nCurSize, size);
-  if (size <= m_nTotalSize)
-    return true;
-
-  size = (size - m_nTotalSize + m_nGrowSize - 1) / m_nGrowSize;
-  size_t iCount = m_Blocks.size();
-  m_Blocks.resize(iCount + size);
-  while (size--) {
-    m_Blocks[iCount++] = FX_Alloc(uint8_t, m_nGrowSize);
-    m_nTotalSize += m_nGrowSize;
-  }
-  return true;
-}
-
 }  // namespace
 
 // static
@@ -294,18 +74,6 @@ IFX_SeekableReadStream::CreateFromFilename(const char* filename) {
   return IFX_SeekableStream::CreateFromFilename(filename, FX_FILEMODE_ReadOnly);
 }
 
-// static
-CFX_RetainPtr<IFX_MemoryStream> IFX_MemoryStream::Create(uint8_t* pBuffer,
-                                                         size_t dwSize,
-                                                         bool bTakeOver) {
-  return pdfium::MakeRetain<CFX_MemoryStream>(pBuffer, dwSize, bTakeOver);
-}
-
-// static
-CFX_RetainPtr<IFX_MemoryStream> IFX_MemoryStream::Create(bool bConsecutive) {
-  return pdfium::MakeRetain<CFX_MemoryStream>(bConsecutive);
-}
-
 bool IFX_SeekableWriteStream::WriteBlock(const void* pData, size_t size) {
   return WriteBlock(pData, GetSize(), size);
 }
diff --git a/core/fxcrt/fx_stream.h b/core/fxcrt/fx_stream.h
index 1aa9feae58..5eb83e5681 100644
--- a/core/fxcrt/fx_stream.h
+++ b/core/fxcrt/fx_stream.h
@@ -111,22 +111,6 @@ class IFX_SeekableStream : public IFX_SeekableReadStream,
   bool Flush() override = 0;
 };
 
-class IFX_MemoryStream : public IFX_SeekableStream {
- public:
-  static CFX_RetainPtr<IFX_MemoryStream> Create(uint8_t* pBuffer,
-                                                size_t nSize,
-                                                bool bTakeOver = false);
-  static CFX_RetainPtr<IFX_MemoryStream> Create(bool bConsecutive = false);
-
-  virtual bool IsConsecutive() const = 0;
-  virtual void EstimateSize(size_t nInitSize, size_t nGrowSize) = 0;
-  virtual uint8_t* GetBuffer() const = 0;
-  virtual void AttachBuffer(uint8_t* pBuffer,
-                            size_t nSize,
-                            bool bTakeOver = false) = 0;
-  virtual void DetachBuffer() = 0;
-};
-
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 class CFindFileData {
  public:
diff --git a/core/fxcrt/xml/cfx_saxreader_unittest.cpp b/core/fxcrt/xml/cfx_saxreader_unittest.cpp
index 7865d0b77c..0bb5e1a066 100644
--- a/core/fxcrt/xml/cfx_saxreader_unittest.cpp
+++ b/core/fxcrt/xml/cfx_saxreader_unittest.cpp
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "core/fxcrt/xml/cfx_saxreader.h"
+#include "core/fxcrt/cfx_memorystream.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
@@ -50,10 +51,11 @@ class CFX_SAXReaderTest : public pdfium::FPDF_Test {
   }
 
   bool StartParse(char* str) {
-    return reader_.StartParse(IFX_MemoryStream::Create(
-                                  reinterpret_cast<uint8_t*>(str), strlen(str)),
-                              0, static_cast<uint32_t>(-1),
-                              CFX_SaxParseMode_NotSkipSpace) >= 0;
+    return reader_.StartParse(
+               pdfium::MakeRetain<CFX_MemoryStream>(
+                   reinterpret_cast<uint8_t*>(str), strlen(str), false),
+               0, static_cast<uint32_t>(-1),
+               CFX_SaxParseMode_NotSkipSpace) >= 0;
   }
 
   int32_t ContinueParse() {