Remove DataProvider from CFWL_WidgetPropertieschromium/2931chromium/2930

This CL removes the generic DataProvider code from CFWL_WidgetProperties and
adds the specific providers to the two classes that require them.

Review-Url: https://codereview.chromium.org/2527683002

1 files changed, 5 insertions, 2 deletions

diff --git a/xfa/fwl/core/cfwl_barcode.cpp b/xfa/fwl/core/cfwl_barcode.cpp
index 97249c92cf..49e417ea9c 100644
--- a/xfa/fwl/core/cfwl_barcode.cpp
+++ b/xfa/fwl/core/cfwl_barcode.cpp
@@ -7,6 +7,7 @@
 #include "xfa/fwl/core/cfwl_barcode.h"
 
 #include <memory>
+#include <utility>
 
 #include "third_party/base/ptr_util.h"
 
@@ -26,8 +27,10 @@ CFWL_Barcode::~CFWL_Barcode() {}
 void CFWL_Barcode::Initialize() {
   ASSERT(!m_pIface);
 
-  m_pIface = pdfium::MakeUnique<IFWL_Barcode>(
-      m_pApp, pdfium::MakeUnique<CFWL_WidgetProperties>(this));
+  auto iface = pdfium::MakeUnique<IFWL_Barcode>(
+      m_pApp, pdfium::MakeUnique<CFWL_WidgetProperties>());
+  iface->SetDataProvider(this);
+  m_pIface = std::move(iface);
 
   CFWL_Widget::Initialize();
 }