Cleanup fwl_* classes and cfx_* classes in fwl.

xfa/fwl/core/ifwl_form.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/ifwl_form.h"
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
@@ skipping 311 matching lines @@
 
 IFWL_Widget* IFWL_Form::DoModal() {
   const IFWL_App* pApp = GetOwnerApp();
   if (!pApp)
     return nullptr;
 
   CFWL_NoteDriver* pDriver = pApp->GetNoteDriver();
   if (!pDriver)
     return nullptr;
 
-  m_pNoteLoop.reset(new CFWL_NoteLoop(this));
+  m_pNoteLoop = pdfium::MakeUnique<CFWL_NoteLoop>();
+  m_pNoteLoop->SetMainForm(this);
+
   pDriver->PushNoteLoop(m_pNoteLoop.get());
   m_bDoModalFlag = true;
   SetStates(FWL_WGTSTATE_Invisible, false);
   pDriver->Run();
 #if (_FX_OS_ == _FX_MACOSX_)
 #else
   pDriver->PopNoteLoop();
 #endif
   m_pNoteLoop.reset();
   return nullptr;
@@ skipping 597 matching lines @@
 
 uint32_t CFWL_SysBtn::GetPartState() const {
   if (IsDisabled())
     return CFWL_PartState_Disabled;
   if (m_dwState & FWL_SYSBUTTONSTATE_Pressed)
     return CFWL_PartState_Pressed;
   if (m_dwState & FWL_SYSBUTTONSTATE_Hover)
     return CFWL_PartState_Hovered;
   return CFWL_PartState_Normal;
 }