Fold the FWL NoteThread classes up to the Thread classes.

xfa/fwl/core/fwl_widgetmgrimp.cpp

Index: xfa/fwl/core/fwl_widgetmgrimp.cpp
diff --git a/xfa/fwl/core/fwl_widgetmgrimp.cpp b/xfa/fwl/core/fwl_widgetmgrimp.cpp
index e0ffd9c7b909565bd051d6e5b8fa9ce2521c7598..e6ca4091e5a39eab6885a12d50c7c36c206a1765 100644
--- a/xfa/fwl/core/fwl_widgetmgrimp.cpp
+++ b/xfa/fwl/core/fwl_widgetmgrimp.cpp
@@ -696,11 +696,11 @@ int32_t CFWL_WidgetMgrDelegate::OnProcessMessageToForm(CFWL_Message* pMessage) {
   if (!pMessage->m_pDstTarget)
     return 0;
   IFWL_Widget* pDstWidget = pMessage->m_pDstTarget;
-  IFWL_NoteThread* pNoteThread = pDstWidget->GetOwnerThread();
-  if (!pNoteThread)
+  IFWL_Thread* pThread = pDstWidget->GetOwnerThread();
+  if (!pThread)
     return 0;
   CFWL_NoteDriver* pNoteDriver =
-      static_cast<CFWL_NoteDriver*>(pNoteThread->GetNoteDriver());
+      static_cast<CFWL_NoteDriver*>(pThread->GetNoteDriver());
   if (!pNoteDriver)
     return 0;
   if (m_pWidgetMgr->IsThreadEnabled()) {