1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Component/UnitTest/ComponentSessionTest.cpp b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
index 1541cce..9763c7f 100644
--- a/Swiften/Component/UnitTest/ComponentSessionTest.cpp
+++ b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
@@ -1,64 +1,64 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <deque>
 #include <boost/bind.hpp>
 #include <boost/optional.hpp>
 
 #include <Swiften/Session/SessionStream.h>
 #include <Swiften/Component/ComponentSession.h>
 #include <Swiften/Elements/ComponentHandshake.h>
 #include <Swiften/Elements/AuthFailure.h>
 
 using namespace Swift;
 
 class ComponentSessionTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(ComponentSessionTest);
 		CPPUNIT_TEST(testStart);
 		CPPUNIT_TEST(testStart_Error);
 		CPPUNIT_TEST(testStart_Unauthorized);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void setUp() {
-			server = boost::shared_ptr<MockSessionStream>(new MockSessionStream());
+			server = boost::make_shared<MockSessionStream>();
 			sessionFinishedReceived = false;
 		}
 
 		void testStart() {
 			boost::shared_ptr<ComponentSession> session(createSession());
 			session->start();
 			server->receiveStreamStart();
 			server->sendStreamStart();
 			server->receiveHandshake();
 			server->sendHandshakeResponse();
 
 			CPPUNIT_ASSERT(server->whitespacePingEnabled);
 
 			session->finish();
 			CPPUNIT_ASSERT(!server->whitespacePingEnabled);
 
 		}
 
 		void testStart_Error() {
 			boost::shared_ptr<ComponentSession> session(createSession());
 			session->start();
 			server->breakConnection();
 
 			CPPUNIT_ASSERT_EQUAL(ComponentSession::Finished, session->getState());
 			CPPUNIT_ASSERT(sessionFinishedReceived);
 			CPPUNIT_ASSERT(sessionFinishedError);
 		}
 
 		void testStart_Unauthorized() {
 			boost::shared_ptr<ComponentSession> session(createSession());
 			session->start();
 			server->receiveStreamStart();
 			server->sendStreamStart();
 			server->receiveHandshake();
 			server->sendHandshakeError();
@@ -127,71 +127,71 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 				}
 
 				virtual bool isTLSEncrypted() {
 					return false;
 				}
 
 				virtual ByteArray getTLSFinishMessage() const {
 					return ByteArray();
 				}
 
 				virtual Certificate::ref getPeerCertificate() const {
 					return Certificate::ref();
 				}
 
 				virtual boost::shared_ptr<CertificateVerificationError> getPeerCertificateVerificationError() const {
 					return boost::shared_ptr<CertificateVerificationError>();
 				}
 
 				virtual bool supportsZLibCompression() {
 					return true;
 				}
 
 				virtual void addZLibCompression() {
 					assert(false);
 				}
 
 				virtual void setWhitespacePingEnabled(bool enabled) {
 					whitespacePingEnabled = enabled;
 				}
 
 				virtual void resetXMPPParser() {
 					resetCount++;
 				}
 
 				void breakConnection() {
-					onClosed(boost::shared_ptr<SessionStream::Error>(new SessionStream::Error(SessionStream::Error::ConnectionReadError)));
+					onClosed(boost::make_shared<SessionStream::Error>(SessionStream::Error::ConnectionReadError));
 				}
 
 				void sendStreamStart() {
 					ProtocolHeader header;
 					header.setFrom("service.foo.com");
 					return onStreamStartReceived(header);
 				}
 
 				void sendHandshakeResponse() {
 					onElementReceived(ComponentHandshake::ref(new ComponentHandshake()));
 				}
 
 				void sendHandshakeError() {
 					// FIXME: This isn't the correct element
 					onElementReceived(AuthFailure::ref(new AuthFailure()));
 				}
 
 				void receiveStreamStart() {
 					Event event = popEvent();
 					CPPUNIT_ASSERT(event.header);
 				}
 
 				void receiveHandshake() {
 					Event event = popEvent();
 					CPPUNIT_ASSERT(event.element);
 					ComponentHandshake::ref handshake(boost::dynamic_pointer_cast<ComponentHandshake>(event.element));
 					CPPUNIT_ASSERT(handshake);
 					CPPUNIT_ASSERT_EQUAL(std::string("4c4f8a41141722c8bbfbdd92d827f7b2fc0a542b"), handshake->getData());
 				}
 
 				Event popEvent() {
 					CPPUNIT_ASSERT(!receivedEvents.empty());
 					Event event = receivedEvents.front();
 					receivedEvents.pop_front();
 					return event;