Merge to XFA: Remove CFX_SegmentedArray use from 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 530 matching lines @@
 
   void RemoveAll() {
     for (int i = 0; i < m_nSize; i++) {
       ((ObjectClass*)GetDataPtr(i))->~ObjectClass();
     }
     CFX_BasicArray::SetSize(0);
   }
 };
 typedef CFX_ObjectArray<CFX_ByteString> CFX_ByteStringArray;
 typedef CFX_ObjectArray<CFX_WideString> CFX_WideStringArray;
+#ifdef PDF_ENABLE_XFA
 class CFX_BaseSegmentedArray {
  public:
   CFX_BaseSegmentedArray(int unit_size = 1,
                          int segment_units = 512,
                          int index_size = 8);
 
   ~CFX_BaseSegmentedArray();
 
   void SetUnitSize(int unit_size, int segment_units, int index_size = 8);
 
@@ skipping 45 matching lines @@
   }
 
   void Add(ElementType data) {
     *(ElementType*)CFX_BaseSegmentedArray::Add() = data;
   }
 
   ElementType& operator[](int index) {
     return *(ElementType*)CFX_BaseSegmentedArray::GetAt(index);
   }
 };
+#endif  // PDF_ENABLE_XFA
 template <class DataType, int FixedSize>
 class CFX_FixedBufGrow {
  public:
   CFX_FixedBufGrow() : m_pData(NULL) {}
   CFX_FixedBufGrow(int data_size) : m_pData(NULL) {
     if (data_size > FixedSize) {
       m_pData = FX_Alloc(DataType, data_size);
     } else {
       FXSYS_memset(m_Data, 0, sizeof(DataType) * FixedSize);
     }
@@ skipping 592 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_