| Index: xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp | 
| diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp | 
| index b8a032ae68704c53eaa4268c7b5082652ab73895..8dc73c4be4a010f1447ec527e42ae9b51c8a3478 100644 | 
| --- a/xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp | 
| +++ b/xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp | 
| @@ -20,22 +20,25 @@ | 
| * limitations under the License. | 
| */ | 
|  | 
| -#include "xfa/fxbarcode/common/BC_CommonByteArray.h" | 
| #include "xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.h" | 
|  | 
| +#include <utility> | 
| + | 
| +#include "xfa/fxbarcode/common/BC_CommonByteArray.h" | 
| + | 
| CBC_QRCoderBlockPair::CBC_QRCoderBlockPair( | 
| -    CBC_CommonByteArray* data, | 
| -    CBC_CommonByteArray* errorCorrection) { | 
| -  m_dataBytes = data; | 
| -  m_errorCorrectionBytes = errorCorrection; | 
| -} | 
| -CBC_QRCoderBlockPair::~CBC_QRCoderBlockPair() { | 
| -  delete m_dataBytes; | 
| -  delete m_errorCorrectionBytes; | 
| -} | 
| -CBC_CommonByteArray* CBC_QRCoderBlockPair::GetDataBytes() { | 
| -  return m_dataBytes; | 
| +    std::unique_ptr<CBC_CommonByteArray> data, | 
| +    std::unique_ptr<CBC_CommonByteArray> errorCorrection) | 
| +    : m_dataBytes(std::move(data)), | 
| +      m_errorCorrectionBytes(std::move(errorCorrection)) {} | 
| + | 
| +CBC_QRCoderBlockPair::~CBC_QRCoderBlockPair() {} | 
| + | 
| +const CBC_CommonByteArray* CBC_QRCoderBlockPair::GetDataBytes() const { | 
| +  return m_dataBytes.get(); | 
| } | 
| -CBC_CommonByteArray* CBC_QRCoderBlockPair::GetErrorCorrectionBytes() { | 
| -  return m_errorCorrectionBytes; | 
| + | 
| +const CBC_CommonByteArray* CBC_QRCoderBlockPair::GetErrorCorrectionBytes() | 
| +    const { | 
| +  return m_errorCorrectionBytes.get(); | 
| } | 
|  |