Merge the CFWL_*Imp classes into the IFWL_* classes.

xfa/fwl/core/ifwl_formproxy.h

Index: xfa/fwl/core/ifwl_formproxy.h
diff --git a/xfa/fwl/basewidget/fwl_formproxyimp.h b/xfa/fwl/core/ifwl_formproxy.h
similarity index 62%
rename from xfa/fwl/basewidget/fwl_formproxyimp.h
rename to xfa/fwl/core/ifwl_formproxy.h
index 56c868e5135d3d4d0d486b6653054471503e3f4d..c188d93a0589b97b38fdfed6a99f86adebb5bac9 100644
--- a/xfa/fwl/basewidget/fwl_formproxyimp.h
+++ b/xfa/fwl/core/ifwl_formproxy.h
@@ -4,22 +4,24 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_BASEWIDGET_FWL_FORMPROXYIMP_H_
-#define XFA_FWL_BASEWIDGET_FWL_FORMPROXYIMP_H_
+#ifndef XFA_FWL_CORE_IFWL_FORMPROXY_H_
+#define XFA_FWL_CORE_IFWL_FORMPROXY_H_
 
-#include "xfa/fwl/core/fwl_formimp.h"
-#include "xfa/fwl/core/fwl_widgetimp.h"
+#include "xfa/fwl/core/ifwl_form.h"
 
 class CFWL_WidgetImpProperties;
 class CFWL_FormProxyImpDelegate;
 
-class CFWL_FormProxyImp : public CFWL_FormImp {
+class IFWL_FormProxy : public IFWL_Form {
  public:
-  CFWL_FormProxyImp(const CFWL_WidgetImpProperties& properties,
-                    IFWL_Widget* pOuter);
-  ~CFWL_FormProxyImp() override;
+  static IFWL_FormProxy* Create(CFWL_WidgetImpProperties& properties,
+                                IFWL_Widget* pOuter);
 
-  // CFWL_WidgetImp
+  IFWL_FormProxy(const CFWL_WidgetImpProperties& properties,
+                 IFWL_Widget* pOuter);
+  ~IFWL_FormProxy() override;
+
+  // IFWL_Widget
   FWL_Error GetClassName(CFX_WideString& wsClass) const override;
   FWL_Type GetClassID() const override;
   FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const override;
@@ -35,11 +37,11 @@ class CFWL_FormProxyImp : public CFWL_FormImp {
 
 class CFWL_FormProxyImpDelegate : public CFWL_WidgetImpDelegate {
  public:
-  CFWL_FormProxyImpDelegate(CFWL_FormProxyImp* pOwner);
+  CFWL_FormProxyImpDelegate(IFWL_FormProxy* pOwner);
   void OnProcessMessage(CFWL_Message* pMessage) override;
 
  protected:
-  CFWL_FormProxyImp* m_pOwner;
+  IFWL_FormProxy* m_pOwner;
 };
 
-#endif  // XFA_FWL_BASEWIDGET_FWL_FORMPROXYIMP_H_
+#endif  // XFA_FWL_CORE_IFWL_FORMPROXY_H_