Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr.

xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h

Index: xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h
index 000036d7c196e32a1fe756e9e443f14545569e32..f315af2fedae5228906ba7341d7996b829ce26cf 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h
@@ -7,7 +7,8 @@
 #ifndef _FWL_COMBOBOX_IMP_H
 #define _FWL_COMBOBOX_IMP_H
 
-#include "third_party/base/nonstd_unique_ptr.h"
+#include <memory>
+
 #include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h"
 #include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h"
 
@@ -164,8 +165,8 @@ class CFWL_ComboBoxImp : public CFWL_WidgetImp {
   CFX_RectF m_rtList;
   CFX_RectF m_rtProxy;
   CFX_RectF m_rtHandler;
-  nonstd::unique_ptr<IFWL_Edit> m_pEdit;
-  nonstd::unique_ptr<IFWL_ListBox> m_pListBox;
+  std::unique_ptr<IFWL_Edit> m_pEdit;
+  std::unique_ptr<IFWL_ListBox> m_pListBox;
   IFWL_Form* m_pForm;
   FX_BOOL m_bLButtonDown;
   FX_BOOL m_bUpFormHandler;