tools: ndn-autoconfig MulticastDiscovery uses FaceQueryDataset

refs #2426

Change-Id: Ib9dcd77564d80b403199e9079d4753dadb96e350
diff --git a/tools/ndn-autoconfig/multicast-discovery.hpp b/tools/ndn-autoconfig/multicast-discovery.hpp
index b437aee..5d03e43 100644
--- a/tools/ndn-autoconfig/multicast-discovery.hpp
+++ b/tools/ndn-autoconfig/multicast-discovery.hpp
@@ -28,8 +28,6 @@
 
 #include "base.hpp"
 
-#include <ndn-cxx/security/validator-null.hpp>
-
 namespace ndn {
 namespace tools {
 namespace autoconfig {
@@ -63,7 +61,10 @@
 
 private:
   void
-  registerHubDiscoveryPrefix(const ConstBufferPtr& buffer);
+  collectMulticastFaces();
+
+  void
+  registerHubDiscoveryPrefix(const std::vector<ndn::nfd::FaceStatus>& dataset);
 
   void
   onRegisterSuccess();
@@ -87,8 +88,6 @@
 private:
   size_t m_nRequestedRegs;
   size_t m_nFinishedRegs;
-
-  ndn::ValidatorNull m_validator;
 };
 
 } // namespace autoconfig