Merge to XFA: Fix fx_string.h compile error under chromium checkouts.

core/include/fxcrt/fx_string.h

Index: core/include/fxcrt/fx_string.h
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index 023f7658c3f9c492d077400b28c7626600a27f3e..fe0985772db6555c143b769ccb6dffb314cf9e19 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -91,7 +91,7 @@ public:
     CFX_ByteStringC& operator = (const CFX_ByteString& src);
 
     bool operator== (const char* ptr) const {
-        return strlen(ptr) == m_Length &&
+        return (FX_STRSIZE)FXSYS_strlen(ptr) == m_Length &&
                 FXSYS_memcmp32(ptr, m_Ptr, m_Length) == 0;
     }
     bool operator== (const CFX_ByteStringC& other) const {
@@ -510,7 +510,7 @@ public:
     CFX_WideStringC& operator = (const CFX_WideString& src);
 
     bool operator== (const wchar_t* ptr) const  {
-        return FXSYS_wcslen(ptr) == m_Length &&
+        return (FX_STRSIZE)FXSYS_wcslen(ptr) == m_Length &&
             wmemcmp(ptr, m_Ptr, m_Length) == 0;
     }
     bool operator== (const CFX_WideStringC& str) const  {