RefCount CPDF_StreamAcc all the time.

Pass stream argument to constructor; it feels like a
stream accessor should always be made from a stream rather
than passing one in after the fact.

Change-Id: Iaa46cb37677b81f0170f5d39bab76ad38ea4af44
Reviewed-on: https://pdfium-review.googlesource.com/3620
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

1 files changed, 18 insertions, 18 deletions

diff --git a/core/fxcodec/jbig2/JBig2_BitStream_unittest.cpp b/core/fxcodec/jbig2/JBig2_BitStream_unittest.cpp
index f9d69b9c53..7b91eff982 100644
--- a/core/fxcodec/jbig2/JBig2_BitStream_unittest.cpp
+++ b/core/fxcodec/jbig2/JBig2_BitStream_unittest.cpp
@@ -16,10 +16,10 @@ TEST(JBig2_BitStream, ReadNBits) {
   data.get()[0] = 0xb1;  // 10110001
 
   auto in_stream = pdfium::MakeUnique<CPDF_Stream>(std::move(data), 1, nullptr);
-  auto acc = pdfium::MakeUnique<CPDF_StreamAcc>();
-  acc->LoadAllData(in_stream.get());
+  auto acc = pdfium::MakeRetain<CPDF_StreamAcc>(in_stream.get());
+  acc->LoadAllData();
 
-  CJBig2_BitStream stream(acc.get());
+  CJBig2_BitStream stream(acc);
 
   uint32_t val1;
   EXPECT_EQ(0, stream.readNBits(1, &val1));
@@ -41,10 +41,10 @@ TEST(JBig2_BitStream, ReadNBitsLargerThenData) {
   data.get()[0] = 0xb1;
 
   auto in_stream = pdfium::MakeUnique<CPDF_Stream>(std::move(data), 1, nullptr);
-  auto acc = pdfium::MakeUnique<CPDF_StreamAcc>();
-  acc->LoadAllData(in_stream.get());
+  auto acc = pdfium::MakeRetain<CPDF_StreamAcc>(in_stream.get());
+  acc->LoadAllData();
 
-  CJBig2_BitStream stream(acc.get());
+  CJBig2_BitStream stream(acc);
 
   uint32_t val1;
   EXPECT_EQ(0, stream.readNBits(10, &val1));
@@ -53,10 +53,10 @@ TEST(JBig2_BitStream, ReadNBitsLargerThenData) {
 
 TEST(JBig2_BitStream, ReadNBitsNullStream) {
   auto in_stream = pdfium::MakeUnique<CPDF_Stream>(nullptr, 0, nullptr);
-  auto acc = pdfium::MakeUnique<CPDF_StreamAcc>();
-  acc->LoadAllData(in_stream.get());
+  auto acc = pdfium::MakeRetain<CPDF_StreamAcc>(in_stream.get());
+  acc->LoadAllData();
 
-  CJBig2_BitStream stream(acc.get());
+  CJBig2_BitStream stream(acc);
 
   uint32_t val1;
   EXPECT_EQ(-1, stream.readNBits(1, &val1));
@@ -69,10 +69,10 @@ TEST(JBig2_BitStream, ReadNBitsEmptyStream) {
   std::unique_ptr<uint8_t, FxFreeDeleter> data(FX_Alloc(uint8_t, 1));
 
   auto in_stream = pdfium::MakeUnique<CPDF_Stream>(std::move(data), 0, nullptr);
-  auto acc = pdfium::MakeUnique<CPDF_StreamAcc>();
-  acc->LoadAllData(in_stream.get());
+  auto acc = pdfium::MakeRetain<CPDF_StreamAcc>(in_stream.get());
+  acc->LoadAllData();
 
-  CJBig2_BitStream stream(acc.get());
+  CJBig2_BitStream stream(acc);
 
   uint32_t val1;
   EXPECT_EQ(-1, stream.readNBits(1, &val1));
@@ -86,10 +86,10 @@ TEST(JBig2_BitStream, ReadNBitsOutOfBounds) {
   data.get()[0] = 0xb1;  // 10110001
 
   auto in_stream = pdfium::MakeUnique<CPDF_Stream>(std::move(data), 1, nullptr);
-  auto acc = pdfium::MakeUnique<CPDF_StreamAcc>();
-  acc->LoadAllData(in_stream.get());
+  auto acc = pdfium::MakeRetain<CPDF_StreamAcc>(in_stream.get());
+  acc->LoadAllData();
 
-  CJBig2_BitStream stream(acc.get());
+  CJBig2_BitStream stream(acc);
 
   uint32_t val1;
   EXPECT_EQ(0, stream.readNBits(8, &val1));
@@ -107,10 +107,10 @@ TEST(JBig2_BitStream, ReadNBitsWhereNIs36) {
   data.get()[4] = 0x40;
 
   auto in_stream = pdfium::MakeUnique<CPDF_Stream>(std::move(data), 5, nullptr);
-  auto acc = pdfium::MakeUnique<CPDF_StreamAcc>();
-  acc->LoadAllData(in_stream.get());
+  auto acc = pdfium::MakeRetain<CPDF_StreamAcc>(in_stream.get());
+  acc->LoadAllData();
 
-  CJBig2_BitStream stream(acc.get());
+  CJBig2_BitStream stream(acc);
 
   // This will shift off the top two bits and they end up lost.
   uint32_t val1;