Fix windows build at ab27768d2359.

core/src/fxge/win32/fx_win32_device.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/include/fxge/fx_ge.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <crtdbg.h>
 
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge_win32.h"
 #include "core/src/fxge/agg/include/fx_agg_driver.h"
 #include "core/src/fxge/dib/dib_int.h"
 #include "core/src/fxge/ge/fx_text_int.h"
-#include "dwrite_int.h"
-#include "win32_int.h"
+#include "core/src/fxge/win32/dwrite_int.h"
+#include "core/src/fxge/win32/win32_int.h"
+#include "third_party/base/stl_util.h"
 
 class CFX_Win32FallbackFontInfo final : public CFX_FolderFontInfo {
  public:
   void* MapFont(int weight,
                 FX_BOOL bItalic,
                 int charset,
                 int pitch_family,
                 const FX_CHAR* family,
                 int& iExact) override;
 };
@@ skipping 158 matching lines @@
     {"Helvetica-Oblique", "Arial", FALSE, TRUE},
     {"Times-Roman", "Times New Roman", FALSE, FALSE},
     {"Times-Bold", "Times New Roman", TRUE, FALSE},
     {"Times-BoldItalic", "Times New Roman", TRUE, TRUE},
     {"Times-Italic", "Times New Roman", FALSE, TRUE},
 };
 CFX_ByteString CFX_Win32FontInfo::FindFont(const CFX_ByteString& name) {
   if (!m_pMapper) {
     return name;
   }
-  int nFonts = m_pMapper->m_InstalledTTFonts.GetSize();
+  int nFonts = pdfium::CollectionSize<int>(m_pMapper->m_InstalledTTFonts);
   for (int i = 0; i < nFonts; i++) {
     CFX_ByteString thisname = m_pMapper->m_InstalledTTFonts[i];
     if (thisname[0] == ' ') {
       if (thisname.Mid(1, name.GetLength()) == name) {
         return m_pMapper->m_InstalledTTFonts[i + 1];
       }
     } else if (thisname.Left(name.GetLength()) == name) {
       return m_pMapper->m_InstalledTTFonts[i];
     }
   }
@@ skipping 1146 matching lines @@
     SelectObject(m_hDC, m_hOldBitmap);
     DeleteDC(m_hDC);
   }
   if (m_hBitmap) {
     DeleteObject(m_hBitmap);
   }
   delete GetBitmap();
 }
 
 #endif  // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_