Fold the FWL NoteThread classes up to the Thread classes.

The NoteThread classes only contained one member and don't provide any
added clarity. This CL moves the NoteDriver up to the Thread classes and
removes the NoteThread classes.

Review URL: https://codereview.chromium.org/1887703003

1 files changed, 3 insertions, 14 deletions

diff --git a/xfa/fwl/core/fwl_threadimp.cpp b/xfa/fwl/core/fwl_threadimp.cpp
index bc58a76f04..d6036b7e3d 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();
 }