Merge to XFA: Kill CFX_ByteArray in master.

core/include/fxcrt/fx_basic.h

 // 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
 
 #ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_
 #define CORE_INCLUDE_FXCRT_FX_BASIC_H_
 
 #include <algorithm>
@@ skipping 417 matching lines @@
     if (iStart < 0) {
       return -1;
     }
     for (; iStart < (int)m_nSize; iStart++)
       if (((TYPE*)m_pData)[iStart] == data) {
         return iStart;
       }
     return -1;
   }
 };
-typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray;
 typedef CFX_ArrayTemplate<FX_WORD> CFX_WordArray;
 typedef CFX_ArrayTemplate<FX_DWORD> CFX_DWordArray;
 typedef CFX_ArrayTemplate<void*> CFX_PtrArray;
 typedef CFX_ArrayTemplate<FX_FILESIZE> CFX_FileSizeArray;
 #ifdef PDF_ENABLE_XFA
 typedef CFX_ArrayTemplate<FX_FLOAT> CFX_FloatArray;
+typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray;
 typedef CFX_ArrayTemplate<int32_t> CFX_Int32Array;
 #endif  // PDF_ENABLE_XFA
 
 template <class ObjectClass>
 class CFX_ObjectArray : public CFX_BasicArray {
  public:
   CFX_ObjectArray() : CFX_BasicArray(sizeof(ObjectClass)) {}
 
   ~CFX_ObjectArray() { RemoveAll(); }
 
@@ skipping 765 matching lines @@
   FX_FLOAT c;
   FX_FLOAT d;
   FX_FLOAT e;
   FX_FLOAT f;
   FX_FLOAT g;
   FX_FLOAT h;
   FX_FLOAT i;
 };
 
 #endif  // CORE_INCLUDE_FXCRT_FX_BASIC_H_