Rename CCodec_BasicModule to fxcodec::BasicModule.

BUG=pdfium:1311

Change-Id: Id488306aba5c5ed24d37b9c95f12be62a0d06880
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/55774
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/render/cpdf_dibbase.cpp b/core/fpdfapi/render/cpdf_dibbase.cpp
index 93f77f3..9e270aa 100644
--- a/core/fpdfapi/render/cpdf_dibbase.cpp
+++ b/core/fpdfapi/render/cpdf_dibbase.cpp
@@ -23,7 +23,7 @@
 #include "core/fpdfapi/parser/fpdf_parser_utility.h"
 #include "core/fpdfapi/render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/render/cpdf_renderstatus.h"
-#include "core/fxcodec/codec/ccodec_basicmodule.h"
+#include "core/fxcodec/codec/basicmodule.h"
 #include "core/fxcodec/codec/ccodec_scanlinedecoder.h"
 #include "core/fxcodec/codec/cjpx_decoder.h"
 #include "core/fxcodec/codec/jbig2module.h"
@@ -487,7 +487,7 @@
     m_pDecoder = CreateFlateDecoder(src_span, m_Width, m_Height, m_nComponents,
                                     m_bpc, pParams);
   } else if (decoder == "RunLengthDecode") {
-    m_pDecoder = CCodec_BasicModule::CreateRunLengthDecoder(
+    m_pDecoder = BasicModule::CreateRunLengthDecoder(
         src_span, m_Width, m_Height, m_nComponents, m_bpc);
   } else if (decoder == "DCTDecode") {
     if (!CreateDCTDecoder(src_span, pParams))
diff --git a/core/fxcodec/BUILD.gn b/core/fxcodec/BUILD.gn
index e4a550b..e6f24e8 100644
--- a/core/fxcodec/BUILD.gn
+++ b/core/fxcodec/BUILD.gn
@@ -10,8 +10,8 @@
   sources = [
     "JBig2_DocumentContext.cpp",
     "JBig2_DocumentContext.h",
-    "codec/ccodec_basicmodule.cpp",
-    "codec/ccodec_basicmodule.h",
+    "codec/basicmodule.cpp",
+    "codec/basicmodule.h",
     "codec/ccodec_scanlinedecoder.cpp",
     "codec/ccodec_scanlinedecoder.h",
     "codec/cfx_codec_memory.cpp",
diff --git a/core/fxcodec/codec/ccodec_basicmodule.cpp b/core/fxcodec/codec/basicmodule.cpp
similarity index 85%
rename from core/fxcodec/codec/ccodec_basicmodule.cpp
rename to core/fxcodec/codec/basicmodule.cpp
index ff3824d..f324133 100644
--- a/core/fxcodec/codec/ccodec_basicmodule.cpp
+++ b/core/fxcodec/codec/basicmodule.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcodec/codec/ccodec_basicmodule.h"
+#include "core/fxcodec/codec/basicmodule.h"
 
 #include <algorithm>
 #include <utility>
@@ -10,12 +10,14 @@
 #include "core/fxcodec/codec/ccodec_scanlinedecoder.h"
 #include "third_party/base/ptr_util.h"
 
+namespace fxcodec {
+
 namespace {
 
-class CCodec_RLScanlineDecoder final : public CCodec_ScanlineDecoder {
+class RLScanlineDecoder final : public CCodec_ScanlineDecoder {
  public:
-  CCodec_RLScanlineDecoder();
-  ~CCodec_RLScanlineDecoder() override;
+  RLScanlineDecoder();
+  ~RLScanlineDecoder() override;
 
   bool Create(pdfium::span<const uint8_t> src_buf,
               int width,
@@ -41,11 +43,11 @@
   uint8_t m_Operator = 0;
 };
 
-CCodec_RLScanlineDecoder::CCodec_RLScanlineDecoder() = default;
+RLScanlineDecoder::RLScanlineDecoder() = default;
 
-CCodec_RLScanlineDecoder::~CCodec_RLScanlineDecoder() = default;
+RLScanlineDecoder::~RLScanlineDecoder() = default;
 
-bool CCodec_RLScanlineDecoder::CheckDestSize() {
+bool RLScanlineDecoder::CheckDestSize() {
   size_t i = 0;
   uint32_t old_size = 0;
   uint32_t dest_size = 0;
@@ -75,11 +77,11 @@
   return true;
 }
 
-bool CCodec_RLScanlineDecoder::Create(pdfium::span<const uint8_t> src_buf,
-                                      int width,
-                                      int height,
-                                      int nComps,
-                                      int bpc) {
+bool RLScanlineDecoder::Create(pdfium::span<const uint8_t> src_buf,
+                               int width,
+                               int height,
+                               int nComps,
+                               int bpc) {
   m_SrcBuf = src_buf;
   m_OutputWidth = m_OrigWidth = width;
   m_OutputHeight = m_OrigHeight = height;
@@ -102,7 +104,7 @@
   return CheckDestSize();
 }
 
-bool CCodec_RLScanlineDecoder::v_Rewind() {
+bool RLScanlineDecoder::v_Rewind() {
   memset(m_pScanline.get(), 0, m_Pitch);
   m_SrcOffset = 0;
   m_bEOD = false;
@@ -110,7 +112,7 @@
   return true;
 }
 
-uint8_t* CCodec_RLScanlineDecoder::v_GetNextLine() {
+uint8_t* RLScanlineDecoder::v_GetNextLine() {
   if (m_SrcOffset == 0) {
     GetNextOperator();
   } else if (m_bEOD) {
@@ -155,7 +157,7 @@
   return m_pScanline.get();
 }
 
-void CCodec_RLScanlineDecoder::GetNextOperator() {
+void RLScanlineDecoder::GetNextOperator() {
   if (m_SrcOffset >= m_SrcBuf.size()) {
     m_Operator = 128;
     return;
@@ -163,7 +165,7 @@
   m_Operator = m_SrcBuf[m_SrcOffset];
   m_SrcOffset++;
 }
-void CCodec_RLScanlineDecoder::UpdateOperator(uint8_t used_bytes) {
+void RLScanlineDecoder::UpdateOperator(uint8_t used_bytes) {
   if (used_bytes == 0) {
     return;
   }
@@ -195,13 +197,13 @@
 }  // namespace
 
 // static
-std::unique_ptr<CCodec_ScanlineDecoder>
-CCodec_BasicModule::CreateRunLengthDecoder(pdfium::span<const uint8_t> src_buf,
-                                           int width,
-                                           int height,
-                                           int nComps,
-                                           int bpc) {
-  auto pDecoder = pdfium::MakeUnique<CCodec_RLScanlineDecoder>();
+std::unique_ptr<CCodec_ScanlineDecoder> BasicModule::CreateRunLengthDecoder(
+    pdfium::span<const uint8_t> src_buf,
+    int width,
+    int height,
+    int nComps,
+    int bpc) {
+  auto pDecoder = pdfium::MakeUnique<RLScanlineDecoder>();
   if (!pDecoder->Create(src_buf, width, height, nComps, bpc))
     return nullptr;
 
@@ -209,7 +211,7 @@
 }
 
 // static
-bool CCodec_BasicModule::RunLengthEncode(
+bool BasicModule::RunLengthEncode(
     pdfium::span<const uint8_t> src_span,
     std::unique_ptr<uint8_t, FxFreeDeleter>* dest_buf,
     uint32_t* dest_size) {
@@ -295,10 +297,9 @@
 }
 
 // static
-bool CCodec_BasicModule::A85Encode(
-    pdfium::span<const uint8_t> src_span,
-    std::unique_ptr<uint8_t, FxFreeDeleter>* dest_buf,
-    uint32_t* dest_size) {
+bool BasicModule::A85Encode(pdfium::span<const uint8_t> src_span,
+                            std::unique_ptr<uint8_t, FxFreeDeleter>* dest_buf,
+                            uint32_t* dest_size) {
   // Check inputs.
   if (!dest_buf || !dest_size)
     return false;
@@ -370,3 +371,5 @@
   *dest_size = out - dest_buf->get();
   return true;
 }
+
+}  // namespace fxcodec
diff --git a/core/fxcodec/codec/ccodec_basicmodule.h b/core/fxcodec/codec/basicmodule.h
similarity index 73%
rename from core/fxcodec/codec/ccodec_basicmodule.h
rename to core/fxcodec/codec/basicmodule.h
index 8f55901..514d02b 100644
--- a/core/fxcodec/codec/ccodec_basicmodule.h
+++ b/core/fxcodec/codec/basicmodule.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_CCODEC_BASICMODULE_H_
-#define CORE_FXCODEC_CODEC_CCODEC_BASICMODULE_H_
+#ifndef CORE_FXCODEC_CODEC_BASICMODULE_H_
+#define CORE_FXCODEC_CODEC_BASICMODULE_H_
 
 #include <memory>
 
@@ -15,7 +15,9 @@
 
 class CCodec_ScanlineDecoder;
 
-class CCodec_BasicModule {
+namespace fxcodec {
+
+class BasicModule {
  public:
   static std::unique_ptr<CCodec_ScanlineDecoder> CreateRunLengthDecoder(
       pdfium::span<const uint8_t> src_buf,
@@ -32,9 +34,13 @@
                         std::unique_ptr<uint8_t, FxFreeDeleter>* dest_buf,
                         uint32_t* dest_size);
 
-  CCodec_BasicModule() = delete;
-  CCodec_BasicModule(const CCodec_BasicModule&) = delete;
-  CCodec_BasicModule& operator=(const CCodec_BasicModule&) = delete;
+  BasicModule() = delete;
+  BasicModule(const BasicModule&) = delete;
+  BasicModule& operator=(const BasicModule&) = delete;
 };
 
-#endif  // CORE_FXCODEC_CODEC_CCODEC_BASICMODULE_H_
+}  // namespace fxcodec
+
+using BasicModule = fxcodec::BasicModule;
+
+#endif  // CORE_FXCODEC_CODEC_BASICMODULE_H_
diff --git a/core/fxcodec/codec/fx_codec_a85_unittest.cpp b/core/fxcodec/codec/fx_codec_a85_unittest.cpp
index c6eb34d..0449ed4 100644
--- a/core/fxcodec/codec/fx_codec_a85_unittest.cpp
+++ b/core/fxcodec/codec/fx_codec_a85_unittest.cpp
@@ -7,7 +7,7 @@
 #include <limits>
 #include <memory>
 
-#include "core/fxcodec/codec/ccodec_basicmodule.h"
+#include "core/fxcodec/codec/basicmodule.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fxcodec, A85TestBadInputs) {
@@ -16,9 +16,9 @@
   uint32_t dest_size = 0;
 
   // Error codes, not segvs, should callers pass us a nullptr pointer.
-  EXPECT_FALSE(CCodec_BasicModule::A85Encode(src_buf, &dest_buf, nullptr));
-  EXPECT_FALSE(CCodec_BasicModule::A85Encode(src_buf, nullptr, &dest_size));
-  EXPECT_FALSE(CCodec_BasicModule::A85Encode({}, &dest_buf, &dest_size));
+  EXPECT_FALSE(BasicModule::A85Encode(src_buf, &dest_buf, nullptr));
+  EXPECT_FALSE(BasicModule::A85Encode(src_buf, nullptr, &dest_size));
+  EXPECT_FALSE(BasicModule::A85Encode({}, &dest_buf, &dest_size));
 }
 
 // No leftover bytes, just translate 2 sets of symbols.
@@ -27,7 +27,7 @@
   const uint8_t src_buf[] = {1, 2, 3, 4, 255, 255, 255, 255};
   std::unique_ptr<uint8_t, FxFreeDeleter> dest_buf;
   uint32_t dest_size = 0;
-  EXPECT_TRUE(CCodec_BasicModule::A85Encode(src_buf, &dest_buf, &dest_size));
+  EXPECT_TRUE(BasicModule::A85Encode(src_buf, &dest_buf, &dest_size));
 
   // Should have 5 chars for each set of 4 and 2 terminators.
   const uint8_t expected_out[] = {33, 60, 78, 63, 43,  115,
@@ -48,8 +48,8 @@
   {
     // 1 Leftover Byte:
     const uint8_t src_buf_1leftover[] = {1, 2, 3, 4, 255};
-    EXPECT_TRUE(CCodec_BasicModule::A85Encode(src_buf_1leftover, &dest_buf,
-                                              &dest_size));
+    EXPECT_TRUE(
+        BasicModule::A85Encode(src_buf_1leftover, &dest_buf, &dest_size));
 
     // 5 chars for first symbol + 2 + 2 terminators.
     uint8_t expected_out_1leftover[] = {33, 60, 78, 63, 43, 114, 114, 126, 62};
@@ -66,8 +66,8 @@
     const uint8_t src_buf_2leftover[] = {1, 2, 3, 4, 255, 254};
     dest_buf.reset();
     dest_size = 0;
-    EXPECT_TRUE(CCodec_BasicModule::A85Encode(src_buf_2leftover, &dest_buf,
-                                              &dest_size));
+    EXPECT_TRUE(
+        BasicModule::A85Encode(src_buf_2leftover, &dest_buf, &dest_size));
     // 5 chars for first symbol + 3 + 2 terminators.
     const uint8_t expected_out_2leftover[] = {33,  60, 78, 63,  43,
                                               115, 56, 68, 126, 62};
@@ -84,8 +84,8 @@
     const uint8_t src_buf_3leftover[] = {1, 2, 3, 4, 255, 254, 253};
     dest_buf.reset();
     dest_size = 0;
-    EXPECT_TRUE(CCodec_BasicModule::A85Encode(src_buf_3leftover, &dest_buf,
-                                              &dest_size));
+    EXPECT_TRUE(
+        BasicModule::A85Encode(src_buf_3leftover, &dest_buf, &dest_size));
     // 5 chars for first symbol + 4 + 2 terminators.
     const uint8_t expected_out_3leftover[] = {33, 60, 78,  63,  43, 115,
                                               56, 77, 114, 126, 62};
@@ -106,7 +106,7 @@
   {
     // Make sure really big values don't break.
     const uint8_t src_buf[] = {1, 2, 3, 4, 0, 0, 0, 0};
-    EXPECT_TRUE(CCodec_BasicModule::A85Encode(src_buf, &dest_buf, &dest_size));
+    EXPECT_TRUE(BasicModule::A85Encode(src_buf, &dest_buf, &dest_size));
 
     // Should have 5 chars for first set of 4 + 1 for z + 2 terminators.
     const uint8_t expected_out[] = {33, 60, 78, 63, 43, 122, 126, 62};
@@ -123,8 +123,7 @@
     const uint8_t src_buf_2[] = {0, 0, 0, 0, 1, 2, 3, 4};
     dest_buf.reset();
     dest_size = 0;
-    EXPECT_TRUE(
-        CCodec_BasicModule::A85Encode(src_buf_2, &dest_buf, &dest_size));
+    EXPECT_TRUE(BasicModule::A85Encode(src_buf_2, &dest_buf, &dest_size));
 
     // Should have 5 chars for set of 4 + 1 for z + 2 terminators.
     const uint8_t expected_out_2[] = {122, 33, 60, 78, 63, 43, 126, 62};
@@ -141,8 +140,7 @@
     const uint8_t src_buf_3[] = {1, 2, 3, 4, 0, 0};
     dest_buf.reset();
     dest_size = 0;
-    EXPECT_TRUE(
-        CCodec_BasicModule::A85Encode(src_buf_3, &dest_buf, &dest_size));
+    EXPECT_TRUE(BasicModule::A85Encode(src_buf_3, &dest_buf, &dest_size));
 
     // Should have 5 chars for set of 4 + 3 for last 2 + 2 terminators.
     const uint8_t expected_out_leftover[] = {33, 60, 78, 63,  43,
@@ -178,7 +176,7 @@
   uint32_t dest_size = 0;
 
   // Should succeed.
-  EXPECT_TRUE(CCodec_BasicModule::A85Encode(src_buf, &dest_buf, &dest_size));
+  EXPECT_TRUE(BasicModule::A85Encode(src_buf, &dest_buf, &dest_size));
 
   // Should have 75 chars in the first row plus 2 char return,
   // 76 chars in the second row plus 2 char return,
diff --git a/core/fxcodec/codec/fx_codec_rle_unittest.cpp b/core/fxcodec/codec/fx_codec_rle_unittest.cpp
index b0323c1..2aecaaf 100644
--- a/core/fxcodec/codec/fx_codec_rle_unittest.cpp
+++ b/core/fxcodec/codec/fx_codec_rle_unittest.cpp
@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "core/fpdfapi/parser/fpdf_parser_decode.h"
-#include "core/fxcodec/codec/ccodec_basicmodule.h"
+#include "core/fxcodec/codec/basicmodule.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fxcodec, RLETestBadInputs) {
@@ -17,11 +17,9 @@
   uint32_t dest_size = 0;
 
   // Error codes, not segvs, should callers pass us a nullptr pointer.
-  EXPECT_FALSE(
-      CCodec_BasicModule::RunLengthEncode(src_buf, &dest_buf, nullptr));
-  EXPECT_FALSE(
-      CCodec_BasicModule::RunLengthEncode(src_buf, nullptr, &dest_size));
-  EXPECT_FALSE(CCodec_BasicModule::RunLengthEncode({}, &dest_buf, &dest_size));
+  EXPECT_FALSE(BasicModule::RunLengthEncode(src_buf, &dest_buf, nullptr));
+  EXPECT_FALSE(BasicModule::RunLengthEncode(src_buf, nullptr, &dest_size));
+  EXPECT_FALSE(BasicModule::RunLengthEncode({}, &dest_buf, &dest_size));
 }
 
 // Check length 1 input works. Check terminating character is applied.
@@ -30,8 +28,7 @@
   std::unique_ptr<uint8_t, FxFreeDeleter> dest_buf;
   uint32_t dest_size = 0;
 
-  EXPECT_TRUE(
-      CCodec_BasicModule::RunLengthEncode(src_buf, &dest_buf, &dest_size));
+  EXPECT_TRUE(BasicModule::RunLengthEncode(src_buf, &dest_buf, &dest_size));
   ASSERT_EQ(3u, dest_size);
   auto dest_buf_span = pdfium::make_span(dest_buf.get(), dest_size);
   EXPECT_EQ(0, dest_buf_span[0]);
@@ -50,8 +47,7 @@
   {
     // Case 1: Match, match
     const uint8_t src_buf_1[] = {2, 2, 2, 2, 4, 4, 4, 4, 4, 4};
-    EXPECT_TRUE(
-        CCodec_BasicModule::RunLengthEncode(src_buf_1, &dest_buf, &dest_size));
+    EXPECT_TRUE(BasicModule::RunLengthEncode(src_buf_1, &dest_buf, &dest_size));
     RunLengthDecode({dest_buf.get(), dest_size}, &decoded_buf, &decoded_size);
     ASSERT_EQ(sizeof(src_buf_1), decoded_size);
     auto decoded_buf_span = pdfium::make_span(decoded_buf.get(), decoded_size);
@@ -64,8 +60,7 @@
     const uint8_t src_buf_2[] = {2, 2, 2, 2, 1, 2, 3, 4, 5, 6};
     dest_buf.reset();
     dest_size = 0;
-    EXPECT_TRUE(
-        CCodec_BasicModule::RunLengthEncode(src_buf_2, &dest_buf, &dest_size));
+    EXPECT_TRUE(BasicModule::RunLengthEncode(src_buf_2, &dest_buf, &dest_size));
     decoded_buf.reset();
     decoded_size = 0;
     RunLengthDecode({dest_buf.get(), dest_size}, &decoded_buf, &decoded_size);
@@ -80,8 +75,7 @@
     const uint8_t src_buf_3[] = {1, 2, 3, 4, 5, 3, 3, 3, 3, 3};
     dest_buf.reset();
     dest_size = 0;
-    EXPECT_TRUE(
-        CCodec_BasicModule::RunLengthEncode(src_buf_3, &dest_buf, &dest_size));
+    EXPECT_TRUE(BasicModule::RunLengthEncode(src_buf_3, &dest_buf, &dest_size));
     decoded_buf.reset();
     decoded_size = 0;
     RunLengthDecode({dest_buf.get(), dest_size}, &decoded_buf, &decoded_size);
@@ -103,8 +97,7 @@
   {
     // Case 1: Match, match
     const uint8_t src_buf_1[260] = {1};
-    EXPECT_TRUE(
-        CCodec_BasicModule::RunLengthEncode(src_buf_1, &dest_buf, &dest_size));
+    EXPECT_TRUE(BasicModule::RunLengthEncode(src_buf_1, &dest_buf, &dest_size));
     RunLengthDecode({dest_buf.get(), dest_size}, &decoded_buf, &decoded_size);
     ASSERT_EQ(sizeof(src_buf_1), decoded_size);
     auto decoded_buf_span = pdfium::make_span(decoded_buf.get(), decoded_size);
@@ -119,8 +112,7 @@
       src_buf_2[i] = static_cast<uint8_t>(i - 125);
     dest_buf.reset();
     dest_size = 0;
-    EXPECT_TRUE(
-        CCodec_BasicModule::RunLengthEncode(src_buf_2, &dest_buf, &dest_size));
+    EXPECT_TRUE(BasicModule::RunLengthEncode(src_buf_2, &dest_buf, &dest_size));
     decoded_buf.reset();
     decoded_size = 0;
     RunLengthDecode({dest_buf.get(), dest_size}, &decoded_buf, &decoded_size);
@@ -137,8 +129,7 @@
       src_buf_3[i] = i;
     dest_buf.reset();
     dest_size = 0;
-    EXPECT_TRUE(
-        CCodec_BasicModule::RunLengthEncode(src_buf_3, &dest_buf, &dest_size));
+    EXPECT_TRUE(BasicModule::RunLengthEncode(src_buf_3, &dest_buf, &dest_size));
     decoded_buf.reset();
     decoded_size = 0;
     RunLengthDecode({dest_buf.get(), dest_size}, &decoded_buf, &decoded_size);
@@ -155,8 +146,7 @@
       src_buf_4[i] = static_cast<uint8_t>(i);
     dest_buf.reset();
     dest_size = 0;
-    EXPECT_TRUE(
-        CCodec_BasicModule::RunLengthEncode(src_buf_4, &dest_buf, &dest_size));
+    EXPECT_TRUE(BasicModule::RunLengthEncode(src_buf_4, &dest_buf, &dest_size));
     decoded_buf.reset();
     decoded_size = 0;
     RunLengthDecode({dest_buf.get(), dest_size}, &decoded_buf, &decoded_size);
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 4e4946e..f07c37f 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -53,7 +53,7 @@
 #endif  // PDF_ENABLE_XFA
 
 #if defined(OS_WIN)
-#include "core/fxcodec/codec/ccodec_basicmodule.h"
+#include "core/fxcodec/codec/basicmodule.h"
 #include "core/fxcodec/codec/faxmodule.h"
 #include "core/fxcodec/codec/flatemodule.h"
 #include "core/fxcodec/codec/jpegmodule.h"
@@ -84,8 +84,8 @@
 
 #if defined(OS_WIN)
 constexpr EncoderIface kEncoderIface = {
-    CCodec_BasicModule::A85Encode, FaxModule::FaxEncode, FlateModule::Encode,
-    JpegModule::JpegEncode, CCodec_BasicModule::RunLengthEncode};
+    BasicModule::A85Encode, FaxModule::FaxEncode, FlateModule::Encode,
+    JpegModule::JpegEncode, BasicModule::RunLengthEncode};
 #endif  // defined(OS_WIN)
 
 void RenderPageImpl(CPDF_PageRenderContext* pContext,
diff --git a/testing/fuzzers/pdf_codec_a85_fuzzer.cc b/testing/fuzzers/pdf_codec_a85_fuzzer.cc
index 5740003..b948a99 100644
--- a/testing/fuzzers/pdf_codec_a85_fuzzer.cc
+++ b/testing/fuzzers/pdf_codec_a85_fuzzer.cc
@@ -5,12 +5,12 @@
 #include <cstdint>
 #include <memory>
 
-#include "core/fxcodec/codec/ccodec_basicmodule.h"
+#include "core/fxcodec/codec/basicmodule.h"
 #include "core/fxcrt/fx_memory.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   std::unique_ptr<uint8_t, FxFreeDeleter> dest_buf;
   uint32_t dest_size = 0;
-  CCodec_BasicModule::A85Encode({data, size}, &dest_buf, &dest_size);
+  BasicModule::A85Encode({data, size}, &dest_buf, &dest_size);
   return 0;
 }
diff --git a/testing/fuzzers/pdf_codec_rle_fuzzer.cc b/testing/fuzzers/pdf_codec_rle_fuzzer.cc
index 34702cb..b1f3fae 100644
--- a/testing/fuzzers/pdf_codec_rle_fuzzer.cc
+++ b/testing/fuzzers/pdf_codec_rle_fuzzer.cc
@@ -5,12 +5,12 @@
 #include <cstdint>
 #include <memory>
 
-#include "core/fxcodec/codec/ccodec_basicmodule.h"
+#include "core/fxcodec/codec/basicmodule.h"
 #include "core/fxcrt/fx_memory.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   std::unique_ptr<uint8_t, FxFreeDeleter> dest_buf;
   uint32_t dest_size = 0;
-  CCodec_BasicModule::RunLengthEncode({data, size}, &dest_buf, &dest_size);
+  BasicModule::RunLengthEncode({data, size}, &dest_buf, &dest_size);
   return 0;
 }