From a5c32a120ae918ecebab4042b3e52278f7a24b51 Mon Sep 17 00:00:00 2001
From: Ryan Harrison <rharrison@chromium.org>
Date: Thu, 28 Sep 2017 17:12:31 -0400
Subject: Extract test subclasses of IFX_SeekableReadStream

There are multiple instances of subclasses that either act as an
invalid stream or one backed by a memory buffer. Merging all of these
into two shared stream classes and removing the others.

BUG=pdfium:911

Change-Id: I264602808c6dc0e5c878da462a5e00883fe43e51
Reviewed-on: https://pdfium-review.googlesource.com/15093
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
---
 core/fpdfapi/parser/cpdf_object_avail_unittest.cpp | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'core/fpdfapi/parser/cpdf_object_avail_unittest.cpp')

diff --git a/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp b/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
index 1a8c6d5d14..5c3da70530 100644
--- a/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
@@ -14,27 +14,12 @@
 #include "core/fpdfapi/parser/cpdf_reference.h"
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "core/fxcrt/fx_stream.h"
+#include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
 
-class InvalidReader : public IFX_SeekableReadStream {
- public:
-  template <typename T, typename... Args>
-  friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
-
-  // IFX_SeekableReadStream overrides:
-  bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override {
-    return false;
-  }
-  FX_FILESIZE GetSize() override { return 100; }
-
- private:
-  InvalidReader() {}
-  ~InvalidReader() override {}
-};
-
 class TestReadValidator : public CPDF_ReadValidator {
  public:
   template <typename T, typename... Args>
@@ -44,7 +29,9 @@ class TestReadValidator : public CPDF_ReadValidator {
 
  protected:
   TestReadValidator()
-      : CPDF_ReadValidator(pdfium::MakeRetain<InvalidReader>(), nullptr) {}
+      : CPDF_ReadValidator(
+            pdfium::MakeRetain<CFX_InvalidSeekableReadStream>(100),
+            nullptr) {}
   ~TestReadValidator() override {}
 };
 
-- 
cgit v1.2.3