Fold the FWL NoteThread classes up to the Thread classes.

xfa/fwl/core/fwl_appimp.cpp

Index: xfa/fwl/core/fwl_appimp.cpp
diff --git a/xfa/fwl/core/fwl_appimp.cpp b/xfa/fwl/core/fwl_appimp.cpp
index 2cff349f82c1c3bac7f8f114eca58a60f5b47a2f..8492be791fce253919c2c08e4727d5a35a955e79 100644
--- a/xfa/fwl/core/fwl_appimp.cpp
+++ b/xfa/fwl/core/fwl_appimp.cpp
@@ -42,7 +42,7 @@ FWL_ERR IFWL_App::Exit(int32_t iExitCode) {
 }
 
 CFWL_AppImp::CFWL_AppImp(IFWL_App* pIface, IFWL_AdapterNative* pAdapter)
-    : CFWL_NoteThreadImp(pIface),
+    : CFWL_ThreadImp(pIface),
       m_pAdapterNative(pAdapter),
       m_pThemeProvider(nullptr) {}
 
@@ -102,7 +102,7 @@ void FWL_SetApp(IFWL_App* pApp) {
 FWL_ERR FWL_SetFullScreen(IFWL_Widget* pWidget, FX_BOOL bFullScreen) {
   if (!pWidget)
     return FWL_ERR_Succeeded;
-  IFWL_NoteThread* pNoteTread = pWidget->GetOwnerThread();
+  IFWL_Thread* pNoteTread = pWidget->GetOwnerThread();
   if (!pNoteTread)
     return FWL_ERR_Succeeded;
   CFWL_NoteDriver* pNoteDriver =