From 9d6a2089c93c94461289b21a29771039eace95e7 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 12 Apr 2017 11:32:32 -0400 Subject: Remove MakeSeekableReadStream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This Cl removes the MakeSeekableReadStream call and, at the one place it's used, creates an IFX_MemoryStream which is a seekable read stream. Change-Id: I6b0b23636eff47f8caca5432313ba99703e21e4d Reviewed-on: https://pdfium-review.googlesource.com/4037 Reviewed-by: Nicolás Peña Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/cxfa_ffapp_unittest.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'xfa/fxfa/cxfa_ffapp_unittest.cpp') diff --git a/xfa/fxfa/cxfa_ffapp_unittest.cpp b/xfa/fxfa/cxfa_ffapp_unittest.cpp index 4d65ccbb2f..fc1d038bac 100644 --- a/xfa/fxfa/cxfa_ffapp_unittest.cpp +++ b/xfa/fxfa/cxfa_ffapp_unittest.cpp @@ -13,13 +13,13 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" #include "third_party/base/ptr_util.h" +#include "xfa/fxfa/cxfa_fileread.h" class CXFAFileReadTest : public pdfium::FPDF_Test {}; TEST_F(CXFAFileReadTest, NoStreams) { std::vector streams; - CFX_RetainPtr fileread = - MakeSeekableReadStream(streams); + auto fileread = pdfium::MakeRetain(streams); uint8_t output_buffer[16]; memset(output_buffer, 0xbd, sizeof(output_buffer)); @@ -31,8 +31,7 @@ TEST_F(CXFAFileReadTest, EmptyStreams) { std::vector streams; auto stream1 = pdfium::MakeUnique(); streams.push_back(stream1.get()); - CFX_RetainPtr fileread = - MakeSeekableReadStream(streams); + auto fileread = pdfium::MakeRetain(streams); uint8_t output_buffer[16]; memset(output_buffer, 0xbd, sizeof(output_buffer)); @@ -57,8 +56,7 @@ TEST_F(CXFAFileReadTest, NormalStreams) { streams.push_back(stream1.get()); streams.push_back(stream2.get()); streams.push_back(stream3.get()); - CFX_RetainPtr fileread = - MakeSeekableReadStream(streams); + auto fileread = pdfium::MakeRetain(streams); uint8_t output_buffer[16]; memset(output_buffer, 0xbd, sizeof(output_buffer)); -- cgit v1.2.3