Merge to XFA: Change nonstd::unique_ptr to take a custom deleter.

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 "fx_memory.h"
@@ skipping 1067 matching lines @@
     m_Location = location;
     m_OldValue = *location;
   }
   ~CFX_AutoRestorer() { *m_Location = m_OldValue; }
 
  private:
   T* m_Location;
   T m_OldValue;
 };
 
+// Used with nonstd::unique_ptr to Release() objects that can't be deleted.
+template <class T>
+struct ReleaseDeleter {
+  inline void operator()(T* ptr) const { ptr->Release(); }
+};
+
+// TODO(thestig) Remove in favor of nonstd::unique_ptr.
 template <class T>
 class CFX_SmartPointer {
  public:
   CFX_SmartPointer(T* pObj) : m_pObj(pObj) {}
   ~CFX_SmartPointer() { m_pObj->Release(); }
   T* Get(void) { return m_pObj; }
   T& operator*(void) { return *m_pObj; }
   T* operator->(void) { return m_pObj; }
 
  protected:
   T* m_pObj;
 };
+
 #define FX_DATALIST_LENGTH 1024
 template <size_t unit>
 class CFX_SortListArray {
  protected:
   struct DataList {
     int32_t start;
 
     int32_t count;
     uint8_t* data;
   };
@@ skipping 174 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_