Fold the FWL NoteThread classes up to the Thread classes.

xfa/fwl/core/fwl_noteimp.cpp

Index: xfa/fwl/core/fwl_noteimp.cpp
diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp
index 05963bba816746860c71849fcee8c25a4326b29a..7de0465a1b7d2e7f6dfcf00b94c3c7c9136b1ef9 100644
--- a/xfa/fwl/core/fwl_noteimp.cpp
+++ b/xfa/fwl/core/fwl_noteimp.cpp
@@ -64,7 +64,7 @@ FWL_ERR CFWL_NoteLoop::SetMainForm(CFWL_WidgetImp* pForm) {
 void CFWL_NoteLoop::GenerateCommondEvent(uint32_t dwCommand) {
   CFWL_EvtMenuCommand ev;
   ev.m_iCommand = dwCommand;
-  IFWL_NoteThread* pThread = m_pForm->GetOwnerThread();
+  IFWL_Thread* pThread = m_pForm->GetOwnerThread();
   if (!pThread)
     return;
   IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
@@ -165,7 +165,7 @@ FWL_ERR CFWL_NoteDriver::UnregisterEventTarget(IFWL_Widget* pListener) {
 void CFWL_NoteDriver::ClearEventTargets(FX_BOOL bRemoveAll) {
   ClearInvalidEventTargets(bRemoveAll);
 }
-IFWL_NoteThread* CFWL_NoteDriver::GetOwnerThread() const {
+IFWL_Thread* CFWL_NoteDriver::GetOwnerThread() const {
   return FWL_GetApp();
 }
 FWL_ERR CFWL_NoteDriver::PushNoteLoop(IFWL_NoteLoop* pNoteLoop) {