1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Avatars/UnitTest/CombinedAvatarProviderTest.cpp b/Swiften/Avatars/UnitTest/CombinedAvatarProviderTest.cpp
index 8aca98e..3e5e9e6 100644
--- a/Swiften/Avatars/UnitTest/CombinedAvatarProviderTest.cpp
+++ b/Swiften/Avatars/UnitTest/CombinedAvatarProviderTest.cpp
@@ -21,62 +21,62 @@
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/MUC/MUCRegistry.h>
 #include <Swiften/Queries/IQRouter.h>
 #include <Swiften/StringCodecs/Hexify.h>
 #include <Swiften/VCards/VCardManager.h>
 #include <Swiften/VCards/VCardMemoryStorage.h>
 
 using namespace Swift;
 
 class CombinedAvatarProviderTest : public CppUnit::TestFixture {
         CPPUNIT_TEST_SUITE(CombinedAvatarProviderTest);
         CPPUNIT_TEST(testGetAvatarWithNoAvatarProviderReturnsEmpty);
         CPPUNIT_TEST(testGetAvatarWithSingleAvatarProvider);
         CPPUNIT_TEST(testGetAvatarWithMultipleAvatarProviderReturnsFirstAvatar);
         CPPUNIT_TEST(testGetAvatarWithMultipleAvatarProviderAndFailingFirstProviderReturnsSecondAvatar);
         CPPUNIT_TEST(testProviderUpdateTriggersChange);
         CPPUNIT_TEST(testProviderUpdateWithoutChangeDoesNotTriggerChange);
         CPPUNIT_TEST(testProviderSecondUpdateTriggersChange);
         CPPUNIT_TEST(testProviderUpdateWithAvatarDisappearingTriggersChange);
         CPPUNIT_TEST(testProviderUpdateAfterAvatarDisappearedTriggersChange);
         CPPUNIT_TEST(testProviderUpdateAfterGetDoesNotTriggerChange);
         CPPUNIT_TEST(testProviderUpdateBareJIDAfterGetFullJID);
         CPPUNIT_TEST(testRemoveProviderDisconnectsUpdates);
         CPPUNIT_TEST(testAddRemoveFallthrough);
         CPPUNIT_TEST_SUITE_END();
 
     public:
         void setUp() {
-            avatarProvider1 = std::unique_ptr<DummyAvatarProvider>(new DummyAvatarProvider());
-            avatarProvider2 = std::unique_ptr<DummyAvatarProvider>(new DummyAvatarProvider());
+            avatarProvider1 = std::make_unique<DummyAvatarProvider>();
+            avatarProvider2 = std::make_unique<DummyAvatarProvider>();
             user1 = JID("user1@bar.com/bla");
             user2 = JID("user2@foo.com/baz");
             avatarHash1 = "ABCDEFG";
             avatarHash2 = "XYZU";
             avatarHash3 = "IDGH";
         }
 
         void testGetAvatarWithNoAvatarProviderReturnsEmpty() {
             std::shared_ptr<CombinedAvatarProvider> testling(createProvider());
 
             boost::optional<std::string> hash = testling->getAvatarHash(user1);
             CPPUNIT_ASSERT(!hash);
         }
 
         void testGetAvatarWithSingleAvatarProvider() {
             std::shared_ptr<CombinedAvatarProvider> testling(createProvider());
             avatarProvider1->avatars[user1] = avatarHash1;
             testling->addProvider(avatarProvider1.get());
 
             boost::optional<std::string> hash = testling->getAvatarHash(user1);
             CPPUNIT_ASSERT(hash);
             CPPUNIT_ASSERT_EQUAL(avatarHash1, *hash);
         }
 
         void testGetAvatarWithMultipleAvatarProviderReturnsFirstAvatar() {
             std::shared_ptr<CombinedAvatarProvider> testling(createProvider());
             avatarProvider1->avatars[user1] = avatarHash1;
             avatarProvider2->avatars[user1] = avatarHash2;
             testling->addProvider(avatarProvider1.get());
             testling->addProvider(avatarProvider2.get());