Get rid of CBC_AutoPtr and use std::unique_ptr instead.

Also fix IWYU in various fxbarcode headers.

R=dsinclair@chromium.org

Review URL: https://codereview.chromium.org/1734823002 .

1 files changed, 4 insertions, 3 deletions

diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
index d7caf68226..3cbad1eade 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
@@ -20,13 +20,15 @@
  * limitations under the License.
  */
 
+#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
+
 #include <algorithm>
+#include <memory>
 
 #include "core/include/fxcrt/fx_basic.h"
 #include "xfa/src/fxbarcode/BC_Reader.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
-#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
 #include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
 #include "xfa/src/fxbarcode/utils.h"
 
@@ -46,9 +48,8 @@ CFX_ByteString CBC_OnedCodaBarReader::DecodeRow(int32_t rowNumber,
                                                 CBC_CommonBitArray* row,
                                                 int32_t hints,
                                                 int32_t& e) {
-  CFX_Int32Array* int32Ptr = FindAsteriskPattern(row, e);
+  std::unique_ptr<CFX_Int32Array> start(FindAsteriskPattern(row, e));
   BC_EXCEPTION_CHECK_ReturnValue(e, "");
-  CBC_AutoPtr<CFX_Int32Array> start(int32Ptr);
   (*start)[1] = 0;
   int32_t nextStart = (*start)[1];
   int32_t end = row->GetSize();