face: Stop using shared_ptr to manage acceptors
This commit also includes a major cleanup of all channels.
Change-Id: I10db9709e0cba6a0691a86482c60b5dbb2956f68
Refs: #2613
diff --git a/tests/daemon/face/tcp.t.cpp b/tests/daemon/face/tcp.t.cpp
index ee2eb41..9ee9881 100644
--- a/tests/daemon/face/tcp.t.cpp
+++ b/tests/daemon/face/tcp.t.cpp
@@ -23,16 +23,19 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "face/tcp-channel.hpp"
+#include "face/tcp-face.hpp"
#include "face/tcp-factory.hpp"
-#include <ndn-cxx/util/dns.hpp>
-#include "core/network-interface.hpp"
-#include <ndn-cxx/security/key-chain.hpp>
+#include "core/network-interface.hpp"
#include "tests/test-common.hpp"
#include "tests/limited-io.hpp"
#include "dummy-stream-sender.hpp"
#include "packet-datasets.hpp"
+#include <ndn-cxx/security/key-chain.hpp>
+#include <ndn-cxx/util/dns.hpp>
+
namespace nfd {
namespace tests {
diff --git a/tests/daemon/face/udp.t.cpp b/tests/daemon/face/udp.t.cpp
index 44772ec..ea62922 100644
--- a/tests/daemon/face/udp.t.cpp
+++ b/tests/daemon/face/udp.t.cpp
@@ -23,9 +23,11 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "face/udp-channel.hpp"
+#include "face/udp-face.hpp"
#include "face/udp-factory.hpp"
-#include "core/network-interface.hpp"
+#include "core/network-interface.hpp"
#include "tests/test-common.hpp"
#include "tests/limited-io.hpp"
#include "face-history.hpp"
diff --git a/tests/daemon/face/unix-stream.t.cpp b/tests/daemon/face/unix-stream.t.cpp
index a3a5488..c1ee2cb 100644
--- a/tests/daemon/face/unix-stream.t.cpp
+++ b/tests/daemon/face/unix-stream.t.cpp
@@ -23,6 +23,8 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "face/unix-stream-channel.hpp"
+#include "face/unix-stream-face.hpp"
#include "face/unix-stream-factory.hpp"
#include "tests/test-common.hpp"
diff --git a/tests/daemon/face/websocket.t.cpp b/tests/daemon/face/websocket.t.cpp
index 8e30517..e0472bc 100644
--- a/tests/daemon/face/websocket.t.cpp
+++ b/tests/daemon/face/websocket.t.cpp
@@ -23,7 +23,10 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "face/websocket-channel.hpp"
+#include "face/websocket-face.hpp"
#include "face/websocket-factory.hpp"
+
#include "tests/test-common.hpp"
#include "tests/limited-io.hpp"
diff --git a/tests/daemon/mgmt/face-query-status-publisher.t.cpp b/tests/daemon/mgmt/face-query-status-publisher.t.cpp
index 076c384..217a863 100644
--- a/tests/daemon/mgmt/face-query-status-publisher.t.cpp
+++ b/tests/daemon/mgmt/face-query-status-publisher.t.cpp
@@ -28,8 +28,6 @@
namespace nfd {
namespace tests {
-NFD_LOG_INIT("FaceQueryStatusPublisherTest");
-
BOOST_FIXTURE_TEST_SUITE(MgmtFaceQueryStatusPublisher, FaceQueryStatusPublisherFixture)
BOOST_AUTO_TEST_CASE(NoConditionFilter)