Fold the FWL NoteThread classes up to the Thread classes.

xfa/fwl/core/fwl_threadimp.h

Index: xfa/fwl/core/fwl_threadimp.h
diff --git a/xfa/fwl/core/fwl_threadimp.h b/xfa/fwl/core/fwl_threadimp.h
index e1787d9d3146a883fe9ec6d9fcffda7d7a0bf856..bb49059bf0c6407c69cbd5de6692b327796e7d66 100644
--- a/xfa/fwl/core/fwl_threadimp.h
+++ b/xfa/fwl/core/fwl_threadimp.h
@@ -7,33 +7,26 @@
 #ifndef XFA_FWL_CORE_FWL_THREADIMP_H_
 #define XFA_FWL_CORE_FWL_THREADIMP_H_
 
+#include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_thread.h"
 
-class CFWL_NoteDriver;
 class IFWL_NoteDriver;
 class IFWL_NoteThread;
 
 class CFWL_ThreadImp {
  public:
+  CFWL_ThreadImp(IFWL_Thread* pIface)
+      : m_pNoteDriver(new CFWL_NoteDriver), m_pIface(pIface) {}
   virtual ~CFWL_ThreadImp() {}
+
   IFWL_Thread* GetInterface() const { return m_pIface; }
+  IFWL_NoteDriver* GetNoteDriver() { return m_pNoteDriver; }
 
  protected:
-  CFWL_ThreadImp(IFWL_Thread* pIface) : m_pIface(pIface) {}
+  CFWL_NoteDriver* const m_pNoteDriver;
 
  private:
   IFWL_Thread* const m_pIface;
 };
 
-class CFWL_NoteThreadImp : public CFWL_ThreadImp {
- public:
-  CFWL_NoteThreadImp(IFWL_NoteThread* pIface);
-  virtual ~CFWL_NoteThreadImp();
-
-  virtual IFWL_NoteDriver* GetNoteDriver();
-
- protected:
-  CFWL_NoteDriver* const m_pNoteDriver;
-};
-
 #endif  // XFA_FWL_CORE_FWL_THREADIMP_H_