Remove other remaining use of std::list::size() from loop body.

core/src/fxcodec/jbig2/JBig2_Context.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/src/fxcodec/jbig2/JBig2_Context.h"
 
 #include <algorithm>
 #include <list>
 #include <utility>
 #include <vector>
 
 #include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
 #include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
 #include "core/src/fxcodec/jbig2/JBig2_GrdProc.h"
 #include "core/src/fxcodec/jbig2/JBig2_GrrdProc.h"
 #include "core/src/fxcodec/jbig2/JBig2_HtrdProc.h"
 #include "core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h"
 #include "core/src/fxcodec/jbig2/JBig2_PddProc.h"
 #include "core/src/fxcodec/jbig2/JBig2_SddProc.h"
 #include "core/src/fxcodec/jbig2/JBig2_TrdProc.h"
+#include "third_party/base/stl_util.h"
 
 namespace {
 
 size_t GetHuffContextSize(uint8_t val) {
   return val == 0 ? 65536 : val == 1 ? 8192 : 1024;
 }
 
 size_t GetRefAggContextSize(FX_BOOL val) {
   return val ? 1024 : 8192;
 }
@@ skipping 597 matching lines @@
     } else {
       pSegment->m_Result.sd = pSymbolDictDecoder->decode_Huffman(
           m_pStream.get(), &gbContext, &grContext, pPause);
       if (!pSegment->m_Result.sd)
         return JBIG2_ERROR_FATAL;
       m_pStream->alignByte();
     }
     if (m_bIsGlobal && kSymbolDictCacheMaxSize > 0) {
       std::unique_ptr<CJBig2_SymbolDict> value =
           pSegment->m_Result.sd->DeepCopy();
-      while (m_pSymbolDictCache->size() >= kSymbolDictCacheMaxSize) {
+      int size = pdfium::CollectionSize<int>(*m_pSymbolDictCache);
+      while (size >= kSymbolDictCacheMaxSize) {
         delete m_pSymbolDictCache->back().second;
         m_pSymbolDictCache->pop_back();
+        --size;
       }
       m_pSymbolDictCache->push_front(CJBig2_CachePair(key, value.release()));
     }
   }
   if (wFlags & 0x0200) {
     if (bUseGbContext)
       pSegment->m_Result.sd->SetGbContext(gbContext);
     if (bUseGrContext)
       pSegment->m_Result.sd->SetGrContext(grContext);
   }
@@ skipping 773 matching lines @@
         SBSYMCODES[CURTEMP].code = CURCODE;
         CURCODE = CURCODE + 1;
       }
       CURTEMP = CURTEMP + 1;
     }
     CURLEN = CURLEN + 1;
   }
   FX_Free(LENCOUNT);
   FX_Free(FIRSTCODE);
 }