3 files changed, 10 insertions, 7 deletions
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index a5af1dbee0..e8594b927b 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -36,6 +36,7 @@
 #include "core/fpdfapi/parser/fpdf_parser_decode.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxge/cfx_graphstatedata.h"
+#include "third_party/base/logging.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
@@ -389,7 +390,7 @@ CPDF_Object* CPDF_StreamContentParser::GetObject(uint32_t index) {
   if (param.m_Type == ContentParam::OBJECT)
     return param.m_pObject.get();
 
-  ASSERT(false);
+  NOTREACHED();
   return nullptr;
 }
 
diff --git a/core/fpdfapi/page/fpdf_page_colors.cpp b/core/fpdfapi/page/fpdf_page_colors.cpp
index 3ba833f1ef..1526b75041 100644
--- a/core/fpdfapi/page/fpdf_page_colors.cpp
+++ b/core/fpdfapi/page/fpdf_page_colors.cpp
@@ -18,6 +18,7 @@
 #include "core/fpdfapi/parser/cpdf_stream_acc.h"
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "core/fxcodec/fx_codec.h"
+#include "third_party/base/logging.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
@@ -105,7 +106,7 @@ bool CPDF_DeviceCS::GetRGB(float* pBuf, float* R, float* G, float* B) const {
       }
       return true;
     default:
-      ASSERT(false);
+      NOTREACHED();
       return false;
   }
 }
@@ -141,7 +142,7 @@ bool CPDF_DeviceCS::SetRGB(float* pBuf, float R, float G, float B) const {
       sRGB_to_AdobeCMYK(R, G, B, pBuf[0], pBuf[1], pBuf[2], pBuf[3]);
       return true;
     default:
-      ASSERT(false);
+      NOTREACHED();
       return false;
   }
 }
@@ -164,7 +165,7 @@ bool CPDF_DeviceCS::v_SetCMYK(float* pBuf,
       pBuf[3] = k;
       return true;
     default:
-      ASSERT(false);
+      NOTREACHED();
       return false;
   }
 }
@@ -213,7 +214,7 @@ void CPDF_DeviceCS::TranslateImageLine(uint8_t* pDestBuf,
       }
       break;
     default:
-      ASSERT(false);
+      NOTREACHED();
       break;
   }
 }
diff --git a/core/fpdfapi/page/fpdf_page_func.cpp b/core/fpdfapi/page/fpdf_page_func.cpp
index bc66adf726..48cd41c090 100644
--- a/core/fpdfapi/page/fpdf_page_func.cpp
+++ b/core/fpdfapi/page/fpdf_page_func.cpp
@@ -20,6 +20,7 @@
 #include "core/fpdfapi/parser/cpdf_stream.h"
 #include "core/fpdfapi/parser/cpdf_stream_acc.h"
 #include "core/fxcrt/fx_safe_types.h"
+#include "third_party/base/logging.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 
@@ -127,13 +128,13 @@ class CPDF_PSOP {
     if (m_op == PSOP_CONST)
       return m_value;
 
-    ASSERT(false);
+    NOTREACHED();
     return 0;
   }
   CPDF_PSProc* GetProc() const {
     if (m_op == PSOP_PROC)
       return m_proc.get();
-    ASSERT(false);
+    NOTREACHED();
     return nullptr;
   }