face: delete deprecated FaceSystem constructor

Change-Id: I54d623f1432428c2c3516a00f66dfe3f847bbc2c
Refs: #3377, #4021

daemon/face/face-system.cpp

@@ -51,11 +51,6 @@ FaceSystem::makePFCtorParams()
   return {addFace, m_netmon};
 }
 
-FaceSystem::FaceSystem(FaceTable& faceTable)
-  : FaceSystem(faceTable, make_shared<ndn::net::NetworkMonitor>(getGlobalIoService()))
-{
-}
-
 FaceSystem::~FaceSystem() = default;
 
 std::set<const ProtocolFactory*>

daemon/face/face-system.hpp

@@ -52,10 +52,6 @@ class FaceSystem : noncopyable
 public:
   FaceSystem(FaceTable& faceTable, shared_ptr<ndn::net::NetworkMonitor> netmon);
 
-  DEPRECATED(
-  explicit
-  FaceSystem(FaceTable& faceTable));
-
   ~FaceSystem();
 
   /** \return ProtocolFactory objects owned by the FaceSystem

daemon/mgmt/face-manager.hpp

@@ -120,9 +120,11 @@ private: // NotificationStream
   void
   connectFaceStateChangeSignal(const Face& face);
 
-PUBLIC_WITH_TESTS_ELSE_PRIVATE:
+private:
   FaceSystem& m_faceSystem;
   FaceTable& m_faceTable;
+
+PUBLIC_WITH_TESTS_ELSE_PRIVATE:
   std::map<FaceId, signal::ScopedConnection> m_faceStateChangeConn;
 
 private:

docs/doxygen.conf.in

@@ -2060,8 +2060,7 @@ PREDEFINED             = DOXYGEN \
                          PUBLIC_WITH_TESTS_ELSE_PROTECTED=protected \
                          PUBLIC_WITH_TESTS_ELSE_PRIVATE=private \
                          PROTECTED_WITH_TESTS_ELSE_PRIVATE=private \
-                         FINAL_UNLESS_WITH_TESTS=final \
-                         DEPRECATED(x)=x
+                         FINAL_UNLESS_WITH_TESTS=final
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

tests/daemon/mgmt/face-manager-command-fixture.cpp

@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
@@ -25,6 +25,8 @@
 
 #include "face-manager-command-fixture.hpp"
 
+#include <ndn-cxx/net/network-monitor-stub.hpp>
+
 namespace nfd {
 namespace tests {
 
@@ -32,7 +34,7 @@ FaceManagerCommandNode::FaceManagerCommandNode(ndn::KeyChain& keyChain, uint16_t
   : face(getGlobalIoService(), keyChain, {true, true})
   , dispatcher(face, keyChain, ndn::security::SigningInfo())
   , authenticator(CommandAuthenticator::create())
-  , faceSystem(faceTable)
+  , faceSystem(faceTable, make_shared<ndn::net::NetworkMonitorStub>(0))
   , manager(faceSystem, dispatcher, *authenticator)
 {
   dispatcher.addTopPrefix("/localhost/nfd");

tests/daemon/mgmt/face-manager-create-face.t.cpp

@@ -313,7 +313,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(NewFace, T, TestCases, FaceManagerCommandFixtur
       FaceUri uri;
       if (uri.parse(FaceType::getParameters().getUri())) {
         // ensure face not created
-        auto& faceTable = this->node1.manager.m_faceTable;
+        const auto& faceTable = this->node1.faceTable;
         BOOST_CHECK(std::none_of(faceTable.begin(), faceTable.end(), [uri] (Face& face) {
           return face.getRemoteUri() == uri;
         }));

tests/daemon/mgmt/face-manager.t.cpp

@@ -44,7 +44,7 @@ class FaceManagerFixture : public NfdManagerCommonFixture
 public:
   FaceManagerFixture()
     : m_faceTable(m_forwarder.getFaceTable())
-    , m_faceSystem(m_faceTable)
+    , m_faceSystem(m_faceTable, make_shared<ndn::net::NetworkMonitorStub>(0))
     , m_manager(m_faceSystem, m_dispatcher, *m_authenticator)
   {
     setTopPrefix();
@@ -295,9 +295,9 @@ private:
 
 BOOST_AUTO_TEST_CASE(ChannelDataset)
 {
-  m_manager.m_faceSystem.m_factories["test"] =
+  m_faceSystem.m_factories["test"] =
     make_unique<TestProtocolFactory>(m_faceSystem.makePFCtorParams());
-  auto factory = static_cast<TestProtocolFactory*>(m_manager.m_faceSystem.getFactoryById("test"));
+  auto factory = static_cast<TestProtocolFactory*>(m_faceSystem.getFactoryById("test"));
 
   const size_t nEntries = 404;
   std::map<std::string, shared_ptr<TestChannel>> addedChannels;