Kill off last uses of FX_NEW in XFA.

It would seem that this never merged completely.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1277583002 .

7 files changed, 18 insertions, 18 deletions

diff --git a/core/src/fxcrt/fx_arabic.cpp b/core/src/fxcrt/fx_arabic.cpp
index 9d2d1bd3dd..ab736f9769 100644
--- a/core/src/fxcrt/fx_arabic.cpp
+++ b/core/src/fxcrt/fx_arabic.cpp
@@ -145,7 +145,7 @@ FX_WCHAR FX_GetArabicFromShaddaTable(FX_WCHAR shadda) {
 };
 #endif
 IFX_ArabicChar* IFX_ArabicChar::Create() {
-  return FX_NEW CFX_ArabicChar;
+  return new CFX_ArabicChar;
 }
 FX_BOOL CFX_ArabicChar::IsArabicChar(FX_WCHAR wch) const {
   FX_DWORD dwRet =
@@ -1055,7 +1055,7 @@ void FX_BidiLine(CFX_RTFCharArray& chars, int32_t iCount, int32_t iBaseLevel) {
   blt.FX_BidiLine(chars, iCount, iBaseLevel);
 }
 IFX_BidiChar* IFX_BidiChar::Create() {
-  return FX_NEW CFX_BidiChar;
+  return new CFX_BidiChar;
 }
 CFX_BidiChar::CFX_BidiChar()
     : m_bSeparateNeutral(TRUE),
diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp
index f1512ff0cb..ed71d975c8 100644
--- a/core/src/fxcrt/fx_basic_util.cpp
+++ b/core/src/fxcrt/fx_basic_util.cpp
@@ -298,7 +298,7 @@ class CFindFileDataW : public CFindFileData {
 void* FX_OpenFolder(const FX_CHAR* path) {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #ifndef _WIN32_WCE
-  CFindFileDataA* pData = FX_NEW CFindFileDataA;
+  CFindFileDataA* pData = new CFindFileDataA;
   if (!pData) {
     return NULL;
   }
@@ -311,7 +311,7 @@ void* FX_OpenFolder(const FX_CHAR* path) {
                        &pData->m_FindData, FindExSearchNameMatch, NULL, 0);
 #endif
 #else
-  CFindFileDataW* pData = FX_NEW CFindFileDataW;
+  CFindFileDataW* pData = new CFindFileDataW;
   if (!pData) {
     return NULL;
   }
@@ -331,7 +331,7 @@ void* FX_OpenFolder(const FX_CHAR* path) {
 }
 void* FX_OpenFolder(const FX_WCHAR* path) {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-  CFindFileDataW* pData = FX_NEW CFindFileDataW;
+  CFindFileDataW* pData = new CFindFileDataW;
   if (!pData) {
     return NULL;
   }
diff --git a/core/src/fxcrt/fx_extension.cpp b/core/src/fxcrt/fx_extension.cpp
index 004e39d5e2..402f86cecb 100644
--- a/core/src/fxcrt/fx_extension.cpp
+++ b/core/src/fxcrt/fx_extension.cpp
@@ -18,7 +18,7 @@ IFX_FileAccess* FX_CreateDefaultFileAccess(const CFX_WideStringC& wsPath) {
     return NULL;
 
   CFX_CRTFileAccess* pFA = NULL;
-  pFA = FX_NEW CFX_CRTFileAccess;
+  pFA = new CFX_CRTFileAccess;
   if (NULL == pFA)
     return NULL;
 
@@ -34,7 +34,7 @@ IFX_FileStream* FX_CreateFileStream(const FX_CHAR* filename, FX_DWORD dwModes) {
     pFA->Release();
     return NULL;
   }
-  return FX_NEW CFX_CRTFileStream(pFA);
+  return new CFX_CRTFileStream(pFA);
 }
 IFX_FileStream* FX_CreateFileStream(const FX_WCHAR* filename,
                                     FX_DWORD dwModes) {
@@ -46,7 +46,7 @@ IFX_FileStream* FX_CreateFileStream(const FX_WCHAR* filename,
     pFA->Release();
     return NULL;
   }
-  return FX_NEW CFX_CRTFileStream(pFA);
+  return new CFX_CRTFileStream(pFA);
 }
 IFX_FileRead* FX_CreateFileRead(const FX_CHAR* filename) {
   return FX_CreateFileStream(filename, FX_FILEMODE_ReadOnly);
@@ -57,10 +57,10 @@ IFX_FileRead* FX_CreateFileRead(const FX_WCHAR* filename) {
 IFX_MemoryStream* FX_CreateMemoryStream(uint8_t* pBuffer,
                                         size_t dwSize,
                                         FX_BOOL bTakeOver) {
-  return FX_NEW CFX_MemoryStream(pBuffer, dwSize, bTakeOver);
+  return new CFX_MemoryStream(pBuffer, dwSize, bTakeOver);
 }
 IFX_MemoryStream* FX_CreateMemoryStream(FX_BOOL bConsecutive) {
-  return FX_NEW CFX_MemoryStream(bConsecutive);
+  return new CFX_MemoryStream(bConsecutive);
 }
 #ifdef __cplusplus
 extern "C" {
diff --git a/core/src/fxcrt/fx_xml_parser.cpp b/core/src/fxcrt/fx_xml_parser.cpp
index 61e66fbc0e..6d3c429523 100644
--- a/core/src/fxcrt/fx_xml_parser.cpp
+++ b/core/src/fxcrt/fx_xml_parser.cpp
@@ -12,14 +12,14 @@ CXML_Parser::~CXML_Parser() {
   }
 }
 FX_BOOL CXML_Parser::Init(uint8_t* pBuffer, size_t size) {
-  m_pDataAcc = FX_NEW CXML_DataBufAcc(pBuffer, size);
+  m_pDataAcc = new CXML_DataBufAcc(pBuffer, size);
   if (!m_pDataAcc) {
     return FALSE;
   }
   return Init(TRUE);
 }
 FX_BOOL CXML_Parser::Init(IFX_FileRead* pFileRead) {
-  m_pDataAcc = FX_NEW CXML_DataStmAcc(pFileRead);
+  m_pDataAcc = new CXML_DataStmAcc(pFileRead);
   if (!m_pDataAcc) {
     return FALSE;
   }
@@ -370,7 +370,7 @@ CXML_Element* CXML_Parser::ParseElement(CXML_Element* pParent,
     return NULL;
   }
   CXML_Element* pElement;
-  pElement = FX_NEW CXML_Element;
+  pElement = new CXML_Element;
   if (pElement) {
     pElement->m_pParent = pParent;
     pElement->SetTag(tag_space, tag_name);
@@ -523,7 +523,7 @@ void CXML_Parser::InsertContentSegment(FX_BOOL bCDATA,
     return;
   }
   CXML_Content* pContent;
-  pContent = FX_NEW CXML_Content;
+  pContent = new CXML_Content;
   if (!pContent) {
     return;
   }
@@ -805,7 +805,7 @@ void CXML_AttrMap::SetAt(const CFX_ByteStringC& space,
     }
   }
   if (!m_pMap) {
-    m_pMap = FX_NEW CFX_ObjectArray<CXML_AttrItem>;
+    m_pMap = new CFX_ObjectArray<CXML_AttrItem>;
   }
   if (!m_pMap) {
     return;
diff --git a/core/src/fxcrt/fxcrt_platforms.cpp b/core/src/fxcrt/fxcrt_platforms.cpp
index 93f78c7f51..a9f22d00c6 100644
--- a/core/src/fxcrt/fxcrt_platforms.cpp
+++ b/core/src/fxcrt/fxcrt_platforms.cpp
@@ -12,7 +12,7 @@
      _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ &&   \
      _FXM_PLATFORM_ != _FXM_PLATFORM_ANDROID_)
 IFXCRT_FileAccess* FXCRT_FileAccess_Create() {
-  return FX_NEW CFXCRT_FileAccess_CRT;
+  return new CFXCRT_FileAccess_CRT;
 }
 void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString& bsMode) {
   if (dwModes & FX_FILEMODE_ReadOnly) {
diff --git a/core/src/fxcrt/fxcrt_posix.cpp b/core/src/fxcrt/fxcrt_posix.cpp
index 03fd345900..88e3d8af1d 100644
--- a/core/src/fxcrt/fxcrt_posix.cpp
+++ b/core/src/fxcrt/fxcrt_posix.cpp
@@ -11,7 +11,7 @@
     _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \
     _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
 IFXCRT_FileAccess* FXCRT_FileAccess_Create() {
-  return FX_NEW CFXCRT_FileAccess_Posix;
+  return new CFXCRT_FileAccess_Posix;
 }
 void FXCRT_Posix_GetFileMode(FX_DWORD dwModes,
                              int32_t& nFlags,
diff --git a/core/src/fxcrt/fxcrt_windows.cpp b/core/src/fxcrt/fxcrt_windows.cpp
index 906e8bd937..86077019af 100644
--- a/core/src/fxcrt/fxcrt_windows.cpp
+++ b/core/src/fxcrt/fxcrt_windows.cpp
@@ -23,7 +23,7 @@ FX_BOOL FX_File_Exist(const CFX_WideStringC& fileName) {
   return (dwAttri & FILE_ATTRIBUTE_DIRECTORY) == 0;
 }
 IFXCRT_FileAccess* FXCRT_FileAccess_Create() {
-  return FX_NEW CFXCRT_FileAccess_Win64;
+  return new CFXCRT_FileAccess_Win64;
 }
 void FXCRT_Windows_GetFileMode(FX_DWORD dwMode,
                                FX_DWORD& dwAccess,