1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Disco/UnitTest/CapsManagerTest.cpp b/Swiften/Disco/UnitTest/CapsManagerTest.cpp
index 153e821..5f1aaf4 100644
--- a/Swiften/Disco/UnitTest/CapsManagerTest.cpp
+++ b/Swiften/Disco/UnitTest/CapsManagerTest.cpp
@@ -20,63 +20,63 @@
 #include <Swiften/Disco/CapsMemoryStorage.h>
 #include <Swiften/Elements/CapsInfo.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Queries/IQRouter.h>
 
 using namespace Swift;
 
 class CapsManagerTest : public CppUnit::TestFixture {
         CPPUNIT_TEST_SUITE(CapsManagerTest);
         CPPUNIT_TEST(testReceiveNewHashRequestsDisco);
         CPPUNIT_TEST(testReceiveSameHashDoesNotRequestDisco);
         CPPUNIT_TEST(testReceiveLegacyCapsDoesNotRequestDisco);
         CPPUNIT_TEST(testReceiveSameHashFromSameUserAfterFailedDiscoDoesNotRequestDisco);
         CPPUNIT_TEST(testReceiveSameHashFromDifferentUserAfterFailedDiscoRequestsDisco);
         CPPUNIT_TEST(testReceiveSameHashFromDifferentUserAfterIncorrectVerificationRequestsDisco);
         CPPUNIT_TEST(testReceiveDifferentHashFromSameUserAfterFailedDiscoDoesNotRequestDisco);
         CPPUNIT_TEST(testReceiveSameHashAfterSuccesfulDiscoDoesNotRequestDisco);
         CPPUNIT_TEST(testReceiveSuccesfulDiscoStoresCaps);
         CPPUNIT_TEST(testReceiveIncorrectVerificationDiscoDoesNotStoreCaps);
         CPPUNIT_TEST(testReceiveFailingDiscoFallsBack);
         CPPUNIT_TEST(testReceiveNoDiscoFallsBack);
         CPPUNIT_TEST(testReceiveFailingFallbackDiscoFallsBack);
         CPPUNIT_TEST(testReceiveSameHashFromFailingUserAfterReconnectRequestsDisco);
         CPPUNIT_TEST(testReconnectResetsFallback);
         CPPUNIT_TEST(testReconnectResetsRequests);
         CPPUNIT_TEST_SUITE_END();
 
     public:
         void setUp() {
             crypto = std::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
-            stanzaChannel = std::unique_ptr<DummyStanzaChannel>(new DummyStanzaChannel());
-            iqRouter = std::unique_ptr<IQRouter>(new IQRouter(stanzaChannel.get()));
-            storage = std::unique_ptr<CapsMemoryStorage>(new CapsMemoryStorage());
+            stanzaChannel = std::make_unique<DummyStanzaChannel>();
+            iqRouter = std::make_unique<IQRouter>(stanzaChannel.get());
+            storage = std::make_unique<CapsMemoryStorage>();
             user1 = JID("user1@bar.com/bla");
             discoInfo1 = std::make_shared<DiscoInfo>();
             discoInfo1->addFeature("http://swift.im/feature1");
             capsInfo1 = std::make_shared<CapsInfo>(CapsInfoGenerator("http://node1.im", crypto.get()).generateCapsInfo(*discoInfo1.get()));
             capsInfo1alt = std::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im", crypto.get()).generateCapsInfo(*discoInfo1.get()));
             user2 = JID("user2@foo.com/baz");
             discoInfo2 = std::make_shared<DiscoInfo>();
             discoInfo2->addFeature("http://swift.im/feature2");
             capsInfo2 = std::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im", crypto.get()).generateCapsInfo(*discoInfo2.get()));
             user3 = JID("user3@foo.com/baz");
             legacyCapsInfo = std::make_shared<CapsInfo>("http://swift.im", "ver1", "");
         }
 
         void tearDown() {
             iqRouter.reset();
         }
 
         void testReceiveNewHashRequestsDisco() {
             std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);
 
             CPPUNIT_ASSERT(stanzaChannel->isRequestAtIndex<DiscoInfo>(0, user1, IQ::Get));
             std::shared_ptr<DiscoInfo> discoInfo(stanzaChannel->sentStanzas[0]->getPayload<DiscoInfo>());
             CPPUNIT_ASSERT(discoInfo);
             CPPUNIT_ASSERT_EQUAL("http://node1.im#" + capsInfo1->getVersion(), discoInfo->getNode());
         }
 
         void testReceiveSameHashDoesNotRequestDisco() {
             std::shared_ptr<CapsManager> testling = createManager();
             sendPresenceWithCaps(user1, capsInfo1);