Fold the FWL NoteThread classes up to the Thread classes.

xfa/fwl/core/fwl_threadimp.cpp

Index: xfa/fwl/core/fwl_threadimp.cpp
diff --git a/xfa/fwl/core/fwl_threadimp.cpp b/xfa/fwl/core/fwl_threadimp.cpp
index bc58a76f048386e3d50c21e9d38dd8617734849e..d6036b7e3dbb787e570f6c31bdc5f0404015b6f5 100644
--- a/xfa/fwl/core/fwl_threadimp.cpp
+++ b/xfa/fwl/core/fwl_threadimp.cpp
@@ -9,23 +9,12 @@
 #include "xfa/fwl/core/fwl_appimp.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_targetimp.h"
-#include "xfa/fwl/core/ifwl_notethread.h"
+#include "xfa/fwl/core/ifwl_thread.h"
 
 void IFWL_Thread::Release() {
   delete m_pImpl;
 }
 
-IFWL_NoteDriver* IFWL_NoteThread::GetNoteDriver() {
-  return static_cast<CFWL_NoteThreadImp*>(GetImpl())->GetNoteDriver();
-}
-
-CFWL_NoteThreadImp::CFWL_NoteThreadImp(IFWL_NoteThread* pIface)
-    : CFWL_ThreadImp(pIface), m_pNoteDriver(new CFWL_NoteDriver) {}
-
-CFWL_NoteThreadImp::~CFWL_NoteThreadImp() {
-  delete m_pNoteDriver;
-}
-
-IFWL_NoteDriver* CFWL_NoteThreadImp::GetNoteDriver() {
-  return m_pNoteDriver;
+IFWL_NoteDriver* IFWL_Thread::GetNoteDriver() const {
+  return static_cast<CFWL_ThreadImp*>(GetImpl())->GetNoteDriver();
 }