1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp b/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
index 8c59741..6548485 100644
--- a/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
+++ b/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
@@ -10,62 +10,62 @@
 #include <boost/bind.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Client/DummyStanzaChannel.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
 #include <Swiften/Disco/CapsInfoGenerator.h>
 #include <Swiften/Disco/CapsProvider.h>
 #include <Swiften/Disco/EntityCapsManager.h>
 #include <Swiften/Elements/CapsInfo.h>
 
 using namespace Swift;
 
 class EntityCapsManagerTest : public CppUnit::TestFixture {
         CPPUNIT_TEST_SUITE(EntityCapsManagerTest);
         CPPUNIT_TEST(testReceiveKnownHash);
         CPPUNIT_TEST(testReceiveKnownHashTwiceDoesNotTriggerChange);
         CPPUNIT_TEST(testReceiveUnknownHashDoesNotTriggerChange);
         CPPUNIT_TEST(testReceiveUnknownHashAfterKnownHashTriggersChangeAndClearsCaps);
         CPPUNIT_TEST(testReceiveUnavailablePresenceAfterKnownHashTriggersChangeAndClearsCaps);
         CPPUNIT_TEST(testReconnectTriggersChangeAndClearsCaps);
         CPPUNIT_TEST(testHashAvailable);
         CPPUNIT_TEST_SUITE_END();
 
     public:
         void setUp() {
             crypto = std::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
 
-            stanzaChannel = std::unique_ptr<DummyStanzaChannel>(new DummyStanzaChannel());
-            capsProvider = std::unique_ptr<DummyCapsProvider>(new DummyCapsProvider());
+            stanzaChannel = std::make_unique<DummyStanzaChannel>();
+            capsProvider = std::make_unique<DummyCapsProvider>();
 
             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 testReceiveKnownHash() {
             std::shared_ptr<EntityCapsManager> testling = createManager();
             capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
             sendPresenceWithCaps(user1, capsInfo1);
 
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(changes.size()));
             CPPUNIT_ASSERT_EQUAL(user1, changes[0]);
             CPPUNIT_ASSERT_EQUAL(discoInfo1, testling->getCaps(user1));
         }
 
         void testReceiveKnownHashTwiceDoesNotTriggerChange() {
             std::shared_ptr<EntityCapsManager> testling = createManager();
             capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
             sendPresenceWithCaps(user1, capsInfo1);
             changes.clear();