Merge lp:~mandel/ubuntu-download-manager/solve-leaks into lp:ubuntu-download-manager

[Manuel de la Peña]

Solve all known mem leaks from the project.

This branch solves all the known memory leaks in the project. in order to run the tests with valgrind do the following:

cd solve-leaks
mkdir build
cd build
qmake ../download-manager.pro
make
LD_LIBRARY_PATH=ubuntu-download-manager-common/:libubuntudownloadmanager/ valgrind --leak-check=full ubuntu-download-manager-tests/ubuntu-download-manager-tests

The above will run the tests and will check for mem leaks, in the result should be that the tests pass and that you have a result similar to the following:

==16989==
==16989== HEAP SUMMARY:
==16989== in use at exit: 34,884 bytes in 646 blocks
==16989== total heap usage: 520,198 allocs, 519,552 frees, 84,422,831 bytes allocated
==16989==
==16989== LEAK SUMMARY:
==16989== definitely lost: 0 bytes in 0 blocks
==16989== indirectly lost: 0 bytes in 0 blocks
==16989== possibly lost: 0 bytes in 0 blocks
==16989== still reachable: 34,884 bytes in 646 blocks
==16989== suppressed: 0 bytes in 0 blocks
==16989== Reachable blocks (those to which a pointer was found) are not shown.
==16989== To see them, rerun with: --leak-check=full --show-reachable=yes
==16989==
==16989== For counts of detected and suppressed errors, rerun with: -v
==16989== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 2 from 2)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/266/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/155

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/266/rebuild

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

+1 it shows a few harmless leaks in T we can ignore.

review: Approve

=== modified file 'libubuntudownloadmanager/downloads/factory.cpp'
--- libubuntudownloadmanager/downloads/factory.cpp	2013-11-28 13:18:20 +0000
+++ libubuntudownloadmanager/downloads/factory.cpp	2013-12-18 10:06:42 +0000
@@ -35,12 +35,21 @@
  */
 
 
+Factory::Factory(QObject* parent)
+    : QObject(parent) {
+    _apparmor = new AppArmor(this);
+}
+
 Factory::Factory(AppArmor* apparmor,
                  QObject* parent)
     : QObject(parent),
         _apparmor(apparmor) {
 }
 
+Factory::~Factory() {
+    delete _apparmor;
+}
+
 void
 Factory::getDownloadPath(const QString& dbusOwner,
                          const QVariantMap& metadata,

=== modified file 'libubuntudownloadmanager/downloads/factory.h'
--- libubuntudownloadmanager/downloads/factory.h	2013-11-28 13:18:20 +0000
+++ libubuntudownloadmanager/downloads/factory.h	2013-12-18 10:06:42 +0000
@@ -34,8 +34,10 @@
     Q_OBJECT
 
  public:
+    explicit Factory(QObject* parent = 0);
     Factory(AppArmor* apparmor,
             QObject *parent = 0);
+    virtual ~Factory();
 
     // create downloads comming from a dbus call
 

=== modified file 'libubuntudownloadmanager/downloads/file_download.cpp'
--- libubuntudownloadmanager/downloads/file_download.cpp	2013-12-12 10:57:27 +0000
+++ libubuntudownloadmanager/downloads/file_download.cpp	2013-12-18 10:06:42 +0000
@@ -398,8 +398,6 @@
         this, &FileDownload::onOnlineStateChanged);
 
     _filePath = getSaveFileName();
-    _reply = NULL;
-    _currentData = NULL;
 
     // ensure that the download is valid
     if (!_url.isValid()) {

=== modified file 'libubuntudownloadmanager/downloads/group_download.cpp'
--- libubuntudownloadmanager/downloads/group_download.cpp	2013-11-28 11:46:34 +0000
+++ libubuntudownloadmanager/downloads/group_download.cpp	2013-12-18 10:06:42 +0000
@@ -299,5 +299,3 @@
 }  // DownloadManager
 
 }  // Ubuntu
-
-#include "moc_group_download.cpp"

=== modified file 'libubuntudownloadmanager/downloads/manager.cpp'
--- libubuntudownloadmanager/downloads/manager.cpp	2013-11-29 11:42:01 +0000
+++ libubuntudownloadmanager/downloads/manager.cpp	2013-12-18 10:06:42 +0000
@@ -37,9 +37,8 @@
       _throttle(0),
       _stoppable(stoppable) {
     _conn = connection;
-    _apparmor = new AppArmor(connection);
     RequestFactory::setStoppable(_stoppable);
-    _downloadFactory = new Factory(_apparmor);
+    _downloadFactory = new Factory(this);
     _downloadsQueue = new Queue(this);
     init();
 }
@@ -63,6 +62,7 @@
 
 Manager::~Manager() {
     delete _downloadsQueue;
+    delete _downloadFactory;
 }
 
 void

=== modified file 'libubuntudownloadmanager/downloads/manager.h'
--- libubuntudownloadmanager/downloads/manager.h	2013-11-29 11:32:39 +0000
+++ libubuntudownloadmanager/downloads/manager.h	2013-12-18 10:06:42 +0000
@@ -97,7 +97,6 @@
  private:
     Application* _app;
     qulonglong _throttle;
-    AppArmor* _apparmor;
     Factory* _downloadFactory;
     Queue* _downloadsQueue;
     DBusConnection* _conn;

=== modified file 'libubuntudownloadmanager/system/system_network_info.cpp'
--- libubuntudownloadmanager/system/system_network_info.cpp	2013-11-27 16:00:50 +0000
+++ libubuntudownloadmanager/system/system_network_info.cpp	2013-12-18 10:06:42 +0000
@@ -105,9 +105,12 @@
 SystemNetworkInfo*
 SystemNetworkInfo::instance() {
     if(_instance == NULL) {
+        qDebug() << "Instance is null";
         _mutex.lock();
-        if(_instance == NULL)
+        if(_instance == NULL){
+            qDebug() << "Create new instance";
             _instance = new SystemNetworkInfo();
+        }
         _mutex.unlock();
     }
     return _instance;

=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.cpp'
--- ubuntu-download-manager-tests/downloads/test_daemon.cpp	2013-12-17 13:42:50 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.cpp	2013-12-18 10:06:42 +0000
@@ -24,6 +24,18 @@
 }
 
 void
+TestDaemon::init() {
+    BaseTestCase::init();
+}
+
+void
+TestDaemon::cleanup() {
+    BaseTestCase::cleanup();
+    SystemNetworkInfo::deleteInstance();
+    RequestFactory::deleteInstance();
+}
+
+void
 TestDaemon::testStart() {
     FakeTimer* timer = new FakeTimer();
     FakeDBusConnection* conn = new FakeDBusConnection();

=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.h'
--- ubuntu-download-manager-tests/downloads/test_daemon.h	2013-11-29 15:47:01 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.h	2013-12-18 10:06:42 +0000
@@ -36,6 +36,8 @@
 
  private slots:  // NOLINT(whitespace/indent)
 
+    void init() override;
+    void cleanup() override;
     void testStart();
     void testStartPath();
     void testStartFailServiceRegister();

=== modified file 'ubuntu-download-manager-tests/downloads/test_download.cpp'
--- ubuntu-download-manager-tests/downloads/test_download.cpp	2013-11-27 13:29:03 +0000
+++ ubuntu-download-manager-tests/downloads/test_download.cpp	2013-12-18 10:06:42 +0000
@@ -55,9 +55,9 @@
 TestDownload::cleanup() {
     BaseTestCase::cleanup();
 
-    delete _networkInfo;
-    delete _reqFactory;
-    delete _processFactory;
+    SystemNetworkInfo::deleteInstance();
+    RequestFactory::deleteInstance();
+    ProcessFactory::deleteInstance();
 }
 
 void
@@ -82,8 +82,8 @@
     QFETCH(QString, path);
     QFETCH(QUrl, url);
 
-    FileDownload* download = new FileDownload(id, path, _isConfined,
-        _rootPath, url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(id, path, _isConfined,
+        _rootPath, url, _metadata, _headers));
 
     // assert that we did set the intial state correctly
     // gets for internal state
@@ -126,8 +126,8 @@
     QFETCH(QString, hash);
     QFETCH(QString, algo);
 
-    FileDownload* download = new FileDownload(id, path, _isConfined,
-        _rootPath, url, hash, algo, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(id, path, _isConfined,
+        _rootPath, url, hash, algo, _metadata, _headers));
 
     QCOMPARE(download->downloadId(), id);
     QCOMPARE(download->path(), path);
@@ -154,8 +154,8 @@
 TestDownload::testPath() {
     // create an app download and assert that the returned data is correct
     QFETCH(QString, path);
-    FileDownload* download = new FileDownload(_id, path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
     QCOMPARE(download->path(), path);
 }
 
@@ -174,8 +174,8 @@
 TestDownload::testUrl() {
     // create an app download and assert that the returned data is correct
     QFETCH(QUrl, url);
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, url, _metadata, _headers));
     QCOMPARE(download->url(), url);
 }
 
@@ -198,9 +198,9 @@
     QFETCH(qulonglong, total);
 
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(progress(qulonglong, qulonglong)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(progress(qulonglong, qulonglong)));
 
     // start the download so that we do have access to the reply
     download->start();  // change state
@@ -241,9 +241,9 @@
     QFETCH(int, total);
 
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(progress(qulonglong, qulonglong)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(progress(qulonglong, qulonglong)));
 
     // start the download so that we do have access to the reply
     download->start();  // change state
@@ -272,9 +272,9 @@
     // assert that the total size is just set once
     // by emitting two signals with diff sizes
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(progress(qulonglong, qulonglong)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(progress(qulonglong, qulonglong)));
 
     // start the download so that we do have access to the reply
     download->start();  // change state
@@ -293,8 +293,8 @@
 
 void
 TestDownload::testTotalSizeNoProgress() {
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
     QCOMPARE(0ULL, download->totalSize());
 }
 
@@ -311,8 +311,8 @@
 void
 TestDownload::testSetThrottleNoReply() {
     QFETCH(qulonglong, speed);
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
     download->setThrottle(speed);
     QCOMPARE(speed, download->throttle());
 }
@@ -332,8 +332,8 @@
     QFETCH(uint, speed);
 
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
     download->setThrottle(speed);
 
     download->start();  // change state
@@ -363,10 +363,10 @@
 TestDownload::testSetGSMDownloadSame() {
     QFETCH(bool, value);
 
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
     download->allowGSMDownload(value);
-    QSignalSpy spy(download , SIGNAL(stateChanged()));
+    QSignalSpy spy(download.data(), SIGNAL(stateChanged()));
 
     download->allowGSMDownload(value);
     QCOMPARE(spy.count(), 0);
@@ -386,10 +386,10 @@
     QFETCH(bool, oldValue);
     QFETCH(bool, newValue);
 
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
     download->allowGSMDownload(oldValue);
-    QSignalSpy spy(download , SIGNAL(stateChanged()));
+    QSignalSpy spy(download.data(), SIGNAL(stateChanged()));
 
     download->allowGSMDownload(newValue);
     QCOMPARE(spy.count(), 1);
@@ -429,8 +429,8 @@
     _networkInfo->setMode(mode.value<QNetworkInfo::NetworkMode>());
     _networkInfo->record();
 
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
     download->allowGSMDownload(true);
     QVERIFY(download->canDownload());
     QList<MethodData> calledMethods = _networkInfo->calledMethods();
@@ -475,8 +475,8 @@
     _networkInfo->setMode(mode.value<QNetworkInfo::NetworkMode>());
     _networkInfo->record();
 
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
     download->allowGSMDownload(false);
 
     QCOMPARE(result, download->canDownload());
@@ -486,9 +486,9 @@
 
 void
 TestDownload::testCancel() {
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(stateChanged()));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(stateChanged()));
     download->cancel();
 
     QCOMPARE(spy.count(), 1);
@@ -497,9 +497,9 @@
 
 void
 TestDownload::testPause() {
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(stateChanged()));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(stateChanged()));
     download->pause();
 
     QCOMPARE(spy.count(), 1);
@@ -508,9 +508,9 @@
 
 void
 TestDownload::testResume() {
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(stateChanged()));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(stateChanged()));
     download->resume();
 
     QCOMPARE(spy.count(), 1);
@@ -519,9 +519,9 @@
 
 void
 TestDownload::testStart() {
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(stateChanged()));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(stateChanged()));
     download->start();
 
     QCOMPARE(spy.count(), 1);
@@ -533,9 +533,9 @@
     // tell the fake nam to record so that we can access the reply
 
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download,
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(),
         SIGNAL(canceled(bool)));  // NOLINT(readability/function)
 
     download->start();  // change state
@@ -564,9 +564,9 @@
 void
 TestDownload::testCancelDownloadNotStarted() {
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download,
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(),
         SIGNAL(canceled(bool)));  // NOLINT(readability/function)
 
     download->cancel();  // change state
@@ -584,9 +584,9 @@
 void
 TestDownload::testPauseDownload() {
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download,
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(),
         SIGNAL(paused(bool)));  // NOLINT(readability/function)
 
     download->start();  // change state
@@ -619,9 +619,9 @@
 
 void
 TestDownload::testPauseDownloadNotStarted() {
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download,
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(),
         SIGNAL(paused(bool)));  // NOLINT(readability/function)
 
     download->pause();
@@ -635,9 +635,9 @@
 
 void
 TestDownload::testResumeRunning() {
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download,
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(),
         SIGNAL(resumed(bool)));  // NOLINT(readability/function)
 
     download->start();
@@ -654,9 +654,9 @@
 void
 TestDownload::testResumeDownload() {
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(paused(bool result)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(paused(bool result)));
 
     download->start();  // change state
     download->startDownload();
@@ -692,9 +692,9 @@
 void
 TestDownload::testStartDownload() {
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download,
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(),
         SIGNAL(started(bool)));  // NOLINT(readability/function)
 
     download->start();  // change state
@@ -713,9 +713,9 @@
 void
 TestDownload::testStartDownloadAlreadyStarted() {
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download,
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(),
         SIGNAL(started(bool)));  // NOLINT(readability/function)
 
     download->start();  // change state
@@ -736,10 +736,10 @@
 void
 TestDownload::testOnSuccessNoHash() {
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(finished(QString)));
-    QSignalSpy processingSpy(download, SIGNAL(processing(QString)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(finished(QString)));
+    QSignalSpy processingSpy(download.data(), SIGNAL(processing(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -759,11 +759,10 @@
 void
 TestDownload::testOnSuccessHashError() {
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url,
-        "imposible-hash-is-not-hex", _algo, _metadata, _headers);
-    QSignalSpy errorSpy(download , SIGNAL(error(QString)));
-    QSignalSpy processingSpy(download, SIGNAL(processing(QString)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, "imposible-hash-is-not-hex", _algo, _metadata, _headers));
+    QSignalSpy errorSpy(download.data(), SIGNAL(error(QString)));
+    QSignalSpy processingSpy(download.data(), SIGNAL(processing(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -789,7 +788,7 @@
 
     // create the spy here else we will register other not interesting
     // signals
-    QSignalSpy stateSpy(download , SIGNAL(stateChanged()));
+    QSignalSpy stateSpy(download.data(), SIGNAL(stateChanged()));
     emit reply->finished();
 
     // the has is a random string so we should get an error signal
@@ -827,10 +826,10 @@
     QFETCH(QString, hash);
 
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, hash, _algo, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(finished(QString)));
-    QSignalSpy processingSpy(download, SIGNAL(processing(QString)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, hash, _algo, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(finished(QString)));
+    QSignalSpy processingSpy(download.data(), SIGNAL(processing(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -864,9 +863,9 @@
 void
 TestDownload::testOnHttpError() {
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(error(QString)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(error(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -911,8 +910,8 @@
 TestDownload::testSetRawHeadersStart() {
     QFETCH(StringMap, headers);
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, headers));
 
     download->start();  // change state
     download->startDownload();
@@ -964,8 +963,8 @@
     // similar to the previous test but we want to ensure that range is not set
     QFETCH(StringMap, headers);
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, headers));
 
     download->start();  // change state
     download->startDownload();
@@ -1012,9 +1011,9 @@
     QFETCH(StringMap, headers);
 
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, headers);
-    QSignalSpy spy(download , SIGNAL(paused(bool result)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, headers));
+    QSignalSpy spy(download.data(), SIGNAL(paused(bool result)));
 
     download->start();  // change state
     download->startDownload();
@@ -1089,9 +1088,9 @@
     QFETCH(StringMap, headers);
 
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, headers);
-    QSignalSpy spy(download , SIGNAL(paused(bool result)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, headers));
+    QSignalSpy spy(download.data(), SIGNAL(paused(bool result)));
 
     download->start();  // change state
     download->startDownload();
@@ -1155,9 +1154,9 @@
 
     _processFactory->record();
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, metadata, _headers);
-    QSignalSpy processingSpy(download, SIGNAL(processing(QString)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, metadata, _headers));
+    QSignalSpy processingSpy(download.data(), SIGNAL(processing(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -1218,9 +1217,9 @@
 
     _processFactory->record();
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, metadata, _headers);
-    QSignalSpy processingSpy(download, SIGNAL(processing(QString)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, metadata, _headers));
+    QSignalSpy processingSpy(download.data(), SIGNAL(processing(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -1281,9 +1280,9 @@
 
     _processFactory->record();
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, metadata, _headers);
-    QSignalSpy processingSpy(download, SIGNAL(processing(QString)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, metadata, _headers));
+    QSignalSpy processingSpy(download.data(), SIGNAL(processing(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -1323,10 +1322,10 @@
 
     _processFactory->record();
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(finished(QString)));
-    QSignalSpy processingSpy(download, SIGNAL(processing(QString)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(finished(QString)));
+    QSignalSpy processingSpy(download.data(), SIGNAL(processing(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -1360,10 +1359,10 @@
 
     _processFactory->record();
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(error(QString)));
-    QSignalSpy processingSpy(download, SIGNAL(processing(QString)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(error(QString)));
+    QSignalSpy processingSpy(download.data(), SIGNAL(processing(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -1397,10 +1396,10 @@
 
     _processFactory->record();
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, metadata, _headers);
-    QSignalSpy spy(download , SIGNAL(error(QString)));
-    QSignalSpy processingSpy(download, SIGNAL(processing(QString)));
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, metadata, _headers));
+    QSignalSpy spy(download.data(), SIGNAL(error(QString)));
+    QSignalSpy processingSpy(download.data(), SIGNAL(processing(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -1435,12 +1434,12 @@
 
     _processFactory->record();
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, metadata, _headers));
 
     // write something in the expected file
     QString fileName = download->filePath();
-    QFile* file = new QFile(fileName);
+    QScopedPointer<QFile> file(new QFile(fileName));
     file->open(QIODevice::ReadWrite | QFile::Append);
     file->write("my data goes here");
     file->close();
@@ -1495,8 +1494,8 @@
 TestDownload::testSetRawHeaderAcceptEncoding() {
     QFETCH(StringMap, headers);
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, headers));
 
     download->start();  // change state
     download->startDownload();
@@ -1517,13 +1516,13 @@
     errors.append(QSslError(QSslError::CertificateExpired));
 
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
 
     download->start();  // change state
     download->startDownload();
 
-    QSignalSpy stateSpy(download , SIGNAL(stateChanged()));
+    QSignalSpy stateSpy(download.data(), SIGNAL(stateChanged()));
 
     // we need to set the data before we pause!!!
     QList<MethodData> calledMethods = _reqFactory->calledMethods();
@@ -1546,13 +1545,13 @@
     errors.append(QSslError(QSslError::CertificateExpired));
 
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
 
     download->start();  // change state
     download->startDownload();
 
-    QSignalSpy stateSpy(download , SIGNAL(stateChanged()));
+    QSignalSpy stateSpy(download.data(), SIGNAL(stateChanged()));
 
     // we need to set the data before we pause!!!
     QList<MethodData> calledMethods = _reqFactory->calledMethods();
@@ -1577,8 +1576,8 @@
     QString localPath = "/home/my/local/path";
     metadata["local-path"] = localPath;
 
-    FileDownload* download = new FileDownload(_id, _path, true,
-        _rootPath, _url, metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, true,
+        _rootPath, _url, metadata, _headers));
 
     qDebug() << download->filePath();
     QVERIFY(download->filePath() != localPath);
@@ -1590,8 +1589,8 @@
     QString localPath = "/home/my/local/path";
     metadata["local-path"] = localPath;
 
-    FileDownload* download = new FileDownload(_id, _path, false,
-        _rootPath, _url, metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, false,
+        _rootPath, _url, metadata, _headers));
 
     qDebug() << download->filePath();
     QCOMPARE(download->filePath(), localPath);
@@ -1599,24 +1598,24 @@
 
 void
 TestDownload::testInvalidUrl() {
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, QUrl(), _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, QUrl(), _metadata, _headers));
 
     QVERIFY(!download->isValid());
 }
 
 void
 TestDownload::testValidUrl() {
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, _metadata, _headers));
 
     QVERIFY(download->isValid());
 }
 
 void
 TestDownload::testInvalidHashAlgorithm() {
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, "hash", "not-valid-algo", _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, "hash", "not-valid-algo", _metadata, _headers));
     QVERIFY(!download->isValid());
 }
 
@@ -1636,8 +1635,8 @@
 void
 TestDownload::testValidHashAlgorithm() {
     QFETCH(QString, algo);
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, "hash", algo, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, "hash", algo, _metadata, _headers));
     QVERIFY(download->isValid());
 }
 
@@ -1645,7 +1644,7 @@
 TestDownload::testInvalidFilePresent() {
     // create a file so that we get an error
     QString filePath = testDirectory() + QDir::separator() + "test_file.jpg";
-    QFile* file = new QFile(filePath);
+    QScopedPointer<QFile> file(new QFile(filePath));
     file->open(QIODevice::ReadWrite | QFile::Append);
     file->write("data data data!");
     file->close();
@@ -1653,8 +1652,8 @@
     QVariantMap metadata;
     metadata["local-path"] = filePath;
 
-    FileDownload* download = new FileDownload(_id, _path, false,
-        _rootPath, _url, metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, false,
+        _rootPath, _url, metadata, _headers));
     QVERIFY(!download->isValid());
 }
 
@@ -1665,8 +1664,8 @@
     QVariantMap metadata;
     metadata["local-path"] = filePath;
 
-    FileDownload* download = new FileDownload(_id, _path, false,
-        _rootPath, _url, metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, false,
+        _rootPath, _url, metadata, _headers));
     QVERIFY(download->isValid());
 }
 
@@ -1675,20 +1674,20 @@
     // create a download and get the filename to use, then write it
     // and create the same download and assert that the filename is diff
 
-    FileDownload* download = new FileDownload(_id, _path, true,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, true,
+        _rootPath, _url, _metadata, _headers));
 
     QString filePath = download->filePath();
 
-    QFile* file = new QFile(filePath);
+    QScopedPointer<QFile> file(new QFile(filePath));
     file->open(QIODevice::ReadWrite | QFile::Append);
     file->write("data data data!");
     file->close();
 
-    download = new FileDownload(_id, _path, true,
-        _rootPath, _url, _metadata, _headers);
+    QScopedPointer<FileDownload> other(new FileDownload(_id, _path, true,
+        _rootPath, _url, _metadata, _headers));
 
-    QVERIFY(filePath != download->filePath());
+    QVERIFY(filePath != other->filePath());
 }
 
 void
@@ -1702,10 +1701,10 @@
     metadata["post-download-command"] = command;
 
     _reqFactory->record();
-    FileDownload* download = new FileDownload(_id, _path, _isConfined,
-        _rootPath, _url, hash, _algo, metadata, _headers);
+    QScopedPointer<FileDownload> download(new FileDownload(_id, _path, _isConfined,
+        _rootPath, _url, hash, _algo, metadata, _headers));
 
-    QSignalSpy processingSpy(download, SIGNAL(processing(QString)));
+    QSignalSpy processingSpy(download.data(), SIGNAL(processing(QString)));
 
     download->start();  // change state
     download->startDownload();

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_factory.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_factory.cpp	2013-11-28 13:18:20 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_factory.cpp	2013-12-18 10:06:42 +0000
@@ -17,6 +17,7 @@
  */
 
 #include <downloads/file_download.h>
+#include <system/file_manager.h>
 #include <system/hash_algorithm.h>
 #include <system/uuid_utils.h>
 #include "test_download_factory.h"
@@ -32,15 +33,17 @@
     _apparmor = new FakeAppArmor(_uuidFactory);
     _networkInfo =  new FakeSystemNetworkInfo();
     SystemNetworkInfo::setInstance(_networkInfo);
-    _processFactory =  new FakeProcessFactory();
-    _downFactory = new Factory(_apparmor, _processFactory);
+    _downFactory = new Factory(_apparmor);
 }
 
 void
 TestDownloadFactory::cleanup() {
     BaseTestCase::cleanup();
 
+    SystemNetworkInfo::deleteInstance();
     delete _downFactory;
+    FileManager::deleteInstance();
+    RequestFactory::deleteInstance();
 }
 
 void
@@ -49,8 +52,8 @@
 
     // create a download, assert that it was
     // created and that the id and the path are correctly set
-    Download* download = _downFactory->createDownload("", QUrl(),
-        QVariantMap(), QMap<QString, QString>());
+    QScopedPointer<Download> download(_downFactory->createDownload("", QUrl(),
+        QVariantMap(), QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -70,8 +73,8 @@
     QString algo = "Md5";
 
     // same as above but assert hash and hash algo
-    Download* download = _downFactory->createDownload("", QUrl(),
-        hash, algo, QVariantMap(), QMap<QString, QString>());
+    QScopedPointer<Download> download(_downFactory->createDownload("", QUrl(),
+        hash, algo, QVariantMap(), QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -82,7 +85,9 @@
     QCOMPARE(download->downloadId(), id->value());
     QCOMPARE(download->path(), path->value());
 
-    FileDownload* single = reinterpret_cast<FileDownload*>(download);
+    // no need to worry about the pointer because it will be
+    // deleted by the QScopedPointer
+    FileDownload* single = reinterpret_cast<FileDownload*>(download.data());
     QCOMPARE(hash, single->hash());
     QCOMPARE(HashAlgorithm::getHashAlgo(algo), single->hashAlgorithm());
 }
@@ -93,9 +98,9 @@
 
     // create a download, assert that it was
     // created and that the id and the path are correctly set
-    Download* download = _downFactory->createDownload("",
+    QScopedPointer<Download> download(_downFactory->createDownload("",
         QList<GroupDownloadStruct>(), "Md5",
-        true, QVariantMap(), QMap<QString, QString>());
+        true, QVariantMap(), QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -118,8 +123,8 @@
     QVariantMap metadata;
     metadata["objectpath"] = id;
 
-    Download* download = _downFactory->createDownload("", QUrl(),
-        metadata, QMap<QString, QString>());
+    QScopedPointer<Download> download(_downFactory->createDownload("", QUrl(),
+        metadata, QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -138,8 +143,8 @@
     QVariantMap metadata;
     metadata["objectpath"] = "bad-id";
 
-    Download* download = _downFactory->createDownload("", QUrl(),
-        QVariantMap(), QMap<QString, QString>());
+    QScopedPointer<Download> download(_downFactory->createDownload("", QUrl(),
+        QVariantMap(), QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -164,8 +169,8 @@
     QString algo = "Md5";
 
     // same as above but assert hash and hash algo
-    Download* download = _downFactory->createDownload("", QUrl(),
-        hash, algo, metadata, QMap<QString, QString>());
+    QScopedPointer<Download> download(_downFactory->createDownload("", QUrl(),
+        hash, algo, metadata, QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -174,7 +179,8 @@
     QCOMPARE(download->downloadId(), id);
     QCOMPARE(download->path(), path->value());
 
-    FileDownload* single = reinterpret_cast<FileDownload*>(download);
+    // not to worry, QSCopedPointer will take care of the pointer
+    FileDownload* single = reinterpret_cast<FileDownload*>(download.data());
     QCOMPARE(hash, single->hash());
     QCOMPARE(HashAlgorithm::getHashAlgo(algo), single->hashAlgorithm());
 }
@@ -190,8 +196,8 @@
     QString algo = "Md5";
 
     // same as above but assert hash and hash algo
-    Download* download = _downFactory->createDownload("", QUrl(),
-        hash, algo, metadata, QMap<QString, QString>());
+    QScopedPointer<Download> download(_downFactory->createDownload("", QUrl(),
+        hash, algo, metadata, QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -202,7 +208,8 @@
     QCOMPARE(download->downloadId(), id->value());
     QCOMPARE(download->path(), path->value());
 
-    FileDownload* single = reinterpret_cast<FileDownload*>(download);
+    // not to worry the QScopedPointer will take care of the pointer
+    FileDownload* single = reinterpret_cast<FileDownload*>(download.data());
     QCOMPARE(hash, single->hash());
     QCOMPARE(HashAlgorithm::getHashAlgo(algo), single->hashAlgorithm());
 }
@@ -218,9 +225,9 @@
     QVariantMap metadata;
     metadata["objectpath"] = id;
 
-    Download* download = _downFactory->createDownload("",
+    QScopedPointer<Download> download(_downFactory->createDownload("",
         QList<GroupDownloadStruct>(), "Md5",
-        true, metadata, QMap<QString, QString>());
+        true, metadata, QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -239,9 +246,9 @@
     QVariantMap metadata;
     metadata["objectpath"] = "bad-id";
 
-    Download* download = _downFactory->createDownload("",
+    QScopedPointer<Download> download(_downFactory->createDownload("",
         QList<GroupDownloadStruct>(), "Md5",
-        true, metadata, QMap<QString, QString>());
+        true, metadata, QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -256,8 +263,8 @@
 void
 TestDownloadFactory::testCreateDownloadForGroup() {
     _apparmor->record();
-    Download* download = _downFactory->createDownloadForGroup(true, "", QUrl(),
-        QVariantMap(), QMap<QString, QString>());
+    QScopedPointer<Download> download(_downFactory->createDownloadForGroup(true, "", QUrl(),
+        QVariantMap(), QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -273,8 +280,8 @@
 void
 TestDownloadFactory::testCreateDownloadForGroupWithHash() {
     _apparmor->record();
-    Download* download = _downFactory->createDownloadForGroup(true, "", QUrl(),
-        "", "Md5", QVariantMap(), QMap<QString, QString>());
+    QScopedPointer<Download> download(_downFactory->createDownloadForGroup(true, "", QUrl(),
+        "", "Md5", QVariantMap(), QMap<QString, QString>()));
 
     QList<MethodData> calledMethods = _apparmor->calledMethods();
     QCOMPARE(1, calledMethods.count());

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_manager.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_manager.cpp	2013-11-29 11:42:01 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_manager.cpp	2013-12-18 10:06:42 +0000
@@ -41,7 +41,7 @@
     _requestFactory = new FakeRequestFactory();
     RequestFactory::setInstance(_requestFactory);
     _downloadFactory = new FakeDownloadFactory(
-        _apparmor, new FakeProcessFactory());
+        _apparmor);
     _man = new Manager(_app, _conn, _downloadFactory, _q);
 }
 
@@ -49,7 +49,12 @@
 TestDownloadManager::cleanup() {
     BaseTestCase::cleanup();
 
+    SystemNetworkInfo::deleteInstance();
+    RequestFactory::deleteInstance();
+    ProcessFactory::deleteInstance();
     delete _man;
+    delete _conn;
+    delete _app;
 }
 
 QCryptographicHash::Algorithm
@@ -246,18 +251,20 @@
 
 void
 TestDownloadManager::testGetAllDownloads() {
+    FakeDownloadQueue* q = new FakeDownloadQueue();
+    FakeAppArmor* apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
+        new UuidFactory()));
+    FakeDownloadFactory* downloadFactory = new FakeDownloadFactory(
+        apparmor);
+
     // add a number of downloads and assert that all the paths are returned
-    _q->record();
+    q->record();
     _conn->record();
 
     // do not use the fake uuid factory, else we only get one object path
-    _apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
-        new UuidFactory()));
-    _downloadFactory = new FakeDownloadFactory(
-        _apparmor, new FakeProcessFactory());
-    _man = new Manager(_app, _conn, _downloadFactory, _q);
+    QScopedPointer<Manager> man(new Manager(_app, _conn, downloadFactory, q));
 
-    QSignalSpy spy(_man, SIGNAL(downloadCreated(QDBusObjectPath)));
+    QSignalSpy spy(man.data(), SIGNAL(downloadCreated(QDBusObjectPath)));
 
     QString firstUrl("http://www.ubuntu.com"),
             secondUrl("http://www.ubuntu.com/phone"),
@@ -265,18 +272,18 @@
     QVariantMap firstMetadata, secondMetadata, thirdMetadata;
     StringMap firstHeaders, secondHeaders, thirdHeaders;
 
-    _man->createDownload(
+    man->createDownload(
         DownloadStruct(firstUrl, firstMetadata, firstHeaders));
-    _man->createDownload(
+    man->createDownload(
         DownloadStruct(secondUrl, secondMetadata, secondHeaders));
-    _man->createDownload(
+    man->createDownload(
         DownloadStruct(thirdUrl, thirdMetadata, thirdHeaders));
 
     QCOMPARE(spy.count(), 3);
 
     // get the diff create downloads and theri paths so
     // that we can assert that they are returned
-    QList<MethodData> calledMethods = _q->calledMethods();
+    QList<MethodData> calledMethods = q->calledMethods();
     QCOMPARE(3, calledMethods.count());
     QList<QString> paths;
     for (int index = 0; index < calledMethods.count(); index++) {
@@ -285,24 +292,26 @@
         paths << download->path();
     }
 
-    QList<QDBusObjectPath> allDownloads = _man->getAllDownloads();
+    QList<QDBusObjectPath> allDownloads = man->getAllDownloads();
     QCOMPARE(paths.count(), allDownloads.count());
 }
 
 void
 TestDownloadManager::testAllDownloadsWithMetadata() {
+    FakeDownloadQueue* q = new FakeDownloadQueue();
+    FakeAppArmor* apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
+        new UuidFactory()));
+    FakeDownloadFactory* downloadFactory = new FakeDownloadFactory(
+        apparmor);
+
     // add a number of downloads and assert that all the paths are returned
-    _q->record();
+    q->record();
     _conn->record();
 
     // do not use the fake uuid factory, else we only get one object path
-    _apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
-        new UuidFactory()));
-    _downloadFactory = new FakeDownloadFactory(
-        _apparmor, new FakeProcessFactory());
-    _man = new Manager(_app, _conn, _downloadFactory, _q);
+    QScopedPointer<Manager> man(new Manager(_app, _conn, downloadFactory, q));
 
-    QSignalSpy spy(_man, SIGNAL(downloadCreated(QDBusObjectPath)));
+    QSignalSpy spy(man.data(), SIGNAL(downloadCreated(QDBusObjectPath)));
 
     QString firstUrl("http://www.ubuntu.com"),
             secondUrl("http://www.ubuntu.com/phone"),
@@ -314,18 +323,18 @@
     secondMetadata["type"] = "second";
     thirdMetadata["type"] = "first";
 
-    _man->createDownload(
+    man->createDownload(
         DownloadStruct(firstUrl, firstMetadata, firstHeaders));
-    _man->createDownload(
+    man->createDownload(
         DownloadStruct(secondUrl, secondMetadata, secondHeaders));
-    _man->createDownload(
+    man->createDownload(
         DownloadStruct(thirdUrl, thirdMetadata, thirdHeaders));
 
     QCOMPARE(spy.count(), 3);
 
     // get the diff create downloads and theri paths so that we
     // can assert that they are returned
-    QList<MethodData> calledMethods = _q->calledMethods();
+    QList<MethodData> calledMethods = q->calledMethods();
     QCOMPARE(3, calledMethods.count());
     QList<QString> downloads;
     for (int index = 0; index < calledMethods.count(); index++) {
@@ -334,7 +343,7 @@
         downloads << download->path();
     }
 
-    QList<QDBusObjectPath> filtered = _man->getAllDownloadsWithMetadata(
+    QList<QDBusObjectPath> filtered = man->getAllDownloadsWithMetadata(
         "type", "first");
 
     QCOMPARE(2, filtered.count());
@@ -372,11 +381,13 @@
     QFETCH(qulonglong, speed);
 
     // do not use the fake uuid factory, else we only get one object path
-    _apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
+    FakeDownloadQueue* q = new FakeDownloadQueue();
+    FakeAppArmor* apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
         new UuidFactory()));
-    _downloadFactory = new FakeDownloadFactory(
-        _apparmor, new FakeProcessFactory());
-    _man = new Manager(_app, _conn, _downloadFactory, _q);
+    FakeDownloadFactory* downloadFactory = new FakeDownloadFactory(
+        apparmor);
+
+    QScopedPointer<Manager> man(new Manager(_app, _conn, downloadFactory, q));
 
     QString firstUrl("http://www.ubuntu.com"),
             secondUrl("http://www.ubuntu.com/phone"),
@@ -388,16 +399,16 @@
     secondMetadata["type"] = "second";
     thirdMetadata["type"] = "first";
 
-    _man->createDownload(
+    man->createDownload(
         DownloadStruct(firstUrl, firstMetadata, firstHeaders));
-    _man->createDownload(
+    man->createDownload(
         DownloadStruct(secondUrl, secondMetadata, secondHeaders));
-    _man->createDownload(
+    man->createDownload(
         DownloadStruct(thirdUrl, thirdMetadata, thirdHeaders));
 
-    _man->setDefaultThrottle(speed);
+    man->setDefaultThrottle(speed);
 
-    QList<MethodData> calledMethods = _q->calledMethods();
+    QList<MethodData> calledMethods = q->calledMethods();
     for (int index = 0; index < calledMethods.count(); index++) {
         FileDownload* download = reinterpret_cast<FileDownload*>(
             calledMethods[index].params().inParams()[0]);
@@ -466,20 +477,30 @@
 
 void
 TestDownloadManager::testStoppable() {
+    FakeDownloadQueue* q = new FakeDownloadQueue();
+    FakeAppArmor* apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
+        new UuidFactory()));
+    FakeDownloadFactory* downloadFactory = new FakeDownloadFactory(
+        apparmor);
     _app->record();
-    _man = new Manager(_app, _conn,
-        _downloadFactory, _q, true);
-    _man->exit();
+
+    QScopedPointer<Manager> man(new Manager(_app, _conn, downloadFactory, q, true));
+    man->exit();
     QList<MethodData> calledMethods = _app->calledMethods();
     QCOMPARE(1, calledMethods.count());
 }
 
 void
 TestDownloadManager::testNotStoppable() {
+    FakeDownloadQueue* q = new FakeDownloadQueue();
+    FakeAppArmor* apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
+        new UuidFactory()));
+    FakeDownloadFactory* downloadFactory = new FakeDownloadFactory(
+        apparmor);
     _app->record();
-    _man = new Manager(_app, _conn,
-        _downloadFactory, _q, false);
-    _man->exit();
+
+    QScopedPointer<Manager> man(new Manager(_app, _conn, downloadFactory, q, false));
+    man->exit();
     QList<MethodData> calledMethods = _app->calledMethods();
     QCOMPARE(0, calledMethods.count());
 }

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_queue.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_queue.cpp	2013-11-27 13:06:46 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_queue.cpp	2013-12-18 10:06:42 +0000
@@ -31,13 +31,13 @@
     _isConfined = true;
     _rootPath = "/random/root/path";
     _networkInfo = new FakeSystemNetworkInfo();
-    _processFactory = new FakeProcessFactory();
+    SystemNetworkInfo::setInstance(_networkInfo);
     _first = new FakeDownload(UuidUtils::getDBusString(QUuid::createUuid()),
         "first-path", _isConfined, _rootPath, QUrl(),
-        QVariantMap(), QMap<QString, QString>(), _processFactory);
+        QVariantMap(), QMap<QString, QString>());
     _second = new FakeDownload(UuidUtils::getDBusString(QUuid::createUuid()),
         "second-path", _isConfined, _rootPath, QUrl(),
-        QVariantMap(), QMap<QString, QString>(), _processFactory);
+        QVariantMap(), QMap<QString, QString>());
     _q = new Queue();
 }
 
@@ -45,6 +45,9 @@
 TestDownloadQueue::cleanup() {
     BaseTestCase::cleanup();
 
+    SystemNetworkInfo::deleteInstance();
+    delete _first;
+    delete _second;
     delete _q;
 }
 

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_queue.h'
--- ubuntu-download-manager-tests/downloads/test_download_queue.h	2013-11-27 13:06:46 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_queue.h	2013-12-18 10:06:42 +0000
@@ -61,7 +61,6 @@
     bool _isConfined;
     QString _rootPath;
     FakeSystemNetworkInfo* _networkInfo;
-    FakeProcessFactory* _processFactory;
     FakeDownload* _first;
     FakeDownload* _second;
     Queue* _q;

=== modified file 'ubuntu-download-manager-tests/downloads/test_downloads_db.cpp'
--- ubuntu-download-manager-tests/downloads/test_downloads_db.cpp	2013-11-27 13:06:46 +0000
+++ ubuntu-download-manager-tests/downloads/test_downloads_db.cpp	2013-12-18 10:06:42 +0000
@@ -56,6 +56,8 @@
     delete _db;
 
     QFile::remove(dbFile);
+    SystemNetworkInfo::deleteInstance();
+    FileManager::deleteInstance();
 }
 
 void
@@ -141,12 +143,10 @@
     QFETCH(QVariantMap, metadata);
     QFETCH(StringMap, headers);
 
-    ProcessFactory* processFactory = new FakeProcessFactory();
-
-    FakeDownload* download = new FakeDownload(id, path, false, "", url, hash,
-        hashAlgoString, metadata, headers, processFactory);
-
-    _db->storeSingleDownload(download);
+    QScopedPointer<FakeDownload> download(new FakeDownload(id, path, false, "", url, hash,
+        hashAlgoString, metadata, headers));
+
+    _db->storeSingleDownload(download.data());
     // query that the download is there and that the data is correct
     QSqlDatabase db = _db->db();
     db.open();
@@ -233,19 +233,17 @@
     QFETCH(QVariantMap, metadata);
     QFETCH(StringMap, headers);
 
-    ProcessFactory* processFactory = new FakeProcessFactory();
-
-    FakeDownload* download = new FakeDownload(id, path, true, "", url, hash,
-        hashAlgoString, metadata, headers, processFactory);
-
-    _db->storeSingleDownload(download);
+    QScopedPointer<FakeDownload> download(new FakeDownload(id, path, true, "", url, hash,
+        hashAlgoString, metadata, headers));
+
+    _db->storeSingleDownload(download.data());
 
     // create a second download with same id but a diff path to test is update
     QString newPath = path + path;
-    FakeDownload* secondDownload = new FakeDownload(id, newPath, true, "",
-        url, hash, hashAlgoString, metadata, headers, processFactory);
+    QScopedPointer<FakeDownload> secondDownload(new FakeDownload(id, newPath, true, "",
+        url, hash, hashAlgoString, metadata, headers));
 
-    _db->storeSingleDownload(secondDownload);
+    _db->storeSingleDownload(secondDownload.data());
 
     // query that the download is there and that the data is correct
     QSqlDatabase db = _db->db();

=== modified file 'ubuntu-download-manager-tests/downloads/test_group_download.cpp'
--- ubuntu-download-manager-tests/downloads/test_group_download.cpp	2013-11-28 13:18:20 +0000
+++ ubuntu-download-manager-tests/downloads/test_group_download.cpp	2013-12-18 10:06:42 +0000
@@ -38,11 +38,9 @@
     _isGSMDownloadAllowed = true;
     _networkInfo = new FakeSystemNetworkInfo();
     SystemNetworkInfo::setInstance(_networkInfo);
-    _processFactory = new FakeProcessFactory();
     _uuidFactory = new UuidFactory();
     _apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(_uuidFactory));
-    _downloadFactory = new FakeDownloadFactory(
-        _apparmor, _processFactory);
+    _downloadFactory = new FakeDownloadFactory(_apparmor);
     _fileManager = new FakeFileManager();
     FileManager::setInstance(_fileManager);
 }
@@ -51,6 +49,8 @@
 TestGroupDownload::cleanup() {
     BaseTestCase::cleanup();
 
+    SystemNetworkInfo::deleteInstance();
+    FileManager::deleteInstance();
     delete _downloadFactory;
 }
 
@@ -72,9 +72,9 @@
     downloads.append(GroupDownloadStruct("http://ubuntu.com",
         "other_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
-        downloads, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined,
+        _rootPath, downloads, _algo, _isGSMDownloadAllowed, _metadata, _headers,
+        _downloadFactory, _fileManager));
     group->cancelDownload();
     foreach(Download* download, _downloadFactory->downloads()) {
         QCOMPARE(Download::CANCEL, download->state());
@@ -93,9 +93,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
-        downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path,
+        _isConfined, _rootPath, downloadsStruct, _algo,
+        _isGSMDownloadAllowed, _metadata, _headers,
+        _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     reinterpret_cast<FakeDownload*>(downloads[0])->emitFinished(deleteFile);
@@ -125,9 +126,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
-        downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path,
+        _isConfined, _rootPath, downloadsStruct, _algo,
+        _isGSMDownloadAllowed, _metadata, _headers,
+        _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     reinterpret_cast<FakeDownload*>(downloads[0])->cancel();
@@ -144,9 +146,9 @@
 TestGroupDownload::testPauseNoDownloads() {
     QList<GroupDownloadStruct> downloads;
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined,
         _rootPath, downloads, _algo, _isGSMDownloadAllowed, _metadata,
-        _headers, _downloadFactory, _fileManager);
+        _headers, _downloadFactory, _fileManager));
     group->pauseDownload();
 }
 
@@ -158,9 +160,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://ubuntu.com",
         "other_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
-        downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path,
+        _isConfined, _rootPath, downloadsStruct, _algo,
+        _isGSMDownloadAllowed, _metadata, _headers,
+        _downloadFactory, _fileManager));
     // start all downlaods
     QList<Download*> downloads = _downloadFactory->downloads();
     foreach(Download* download, downloads) {
@@ -184,9 +187,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
-        downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path,
+        _isConfined, _rootPath, downloadsStruct, _algo,
+        _isGSMDownloadAllowed, _metadata, _headers,
+        _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     reinterpret_cast<FakeDownload*>(downloads[0])->emitFinished(deleteFile);
@@ -216,9 +220,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
-        downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path,
+        _isConfined, _rootPath, downloadsStruct, _algo,
+        _isGSMDownloadAllowed, _metadata, _headers,
+        _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     reinterpret_cast<FakeDownload*>(downloads[0])->cancel();
@@ -237,9 +242,9 @@
 TestGroupDownload::testResumeNoDownloads() {
     QList<GroupDownloadStruct> downloads;
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
-        downloads, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path,
+        _isConfined, _rootPath, downloads, _algo, _isGSMDownloadAllowed,
+        _metadata, _headers, _downloadFactory, _fileManager));
     group->cancelDownload();
 }
 
@@ -255,9 +260,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
-        downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path,
+        _isConfined, _rootPath, downloadsStruct, _algo, _isGSMDownloadAllowed,
+        _metadata, _headers, _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     foreach(Download* download, downloads) {
@@ -285,9 +290,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
-        downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path,
+        _isConfined, _rootPath, downloadsStruct, _algo,
+        _isGSMDownloadAllowed, _metadata, _headers, _downloadFactory,
+        _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     qDebug() << "Downloads" << downloads;
@@ -319,9 +325,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined,
         _rootPath, downloadsStruct, _algo, _isGSMDownloadAllowed,
-        _metadata, _headers, _downloadFactory, _fileManager);
+        _metadata, _headers, _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     (downloads[0])->cancel();
@@ -352,10 +358,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined,
         _rootPath, downloadsStruct, _algo, _isGSMDownloadAllowed,
         _metadata, _headers, _downloadFactory,
-        _fileManager);
+        _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     group->resumeDownload();
@@ -371,10 +377,10 @@
 TestGroupDownload::testStartNoDownloads() {
     QList<GroupDownloadStruct> downloads;
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined,
         _rootPath, downloads, _algo,
         _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
     group->startDownload();
 }
 
@@ -390,9 +396,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     group->startDownload();
@@ -416,9 +422,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     group->startDownload();
@@ -446,9 +452,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     group->startDownload();
@@ -478,9 +484,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     reinterpret_cast<FakeDownload*>(downloads[0])->emitFinished(deleteFile);
@@ -507,9 +513,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     downloads[0]->cancel();
@@ -537,10 +543,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
-    QSignalSpy spy(group, SIGNAL(finished(QStringList)));
+        _downloadFactory, _fileManager));
+    QSignalSpy spy(group.data(), SIGNAL(finished(QStringList)));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     group->startDownload();
@@ -564,10 +570,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
-    QSignalSpy spy(group, SIGNAL(finished(QStringList)));
+        _downloadFactory, _fileManager));
+    QSignalSpy spy(group.data(), SIGNAL(finished(QStringList)));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     group->startDownload();
@@ -592,10 +598,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
-    QSignalSpy spy(group, SIGNAL(error(QString)));
+        _downloadFactory, _fileManager));
+    QSignalSpy spy(group.data(), SIGNAL(error(QString)));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     group->startDownload();
@@ -620,10 +626,10 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
-    QSignalSpy spy(group, SIGNAL(error(QString)));
+        _downloadFactory, _fileManager));
+    QSignalSpy spy(group.data(), SIGNAL(error(QString)));
 
     QList<Download*> downloads = _downloadFactory->downloads();
     group->startDownload();
@@ -650,9 +656,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, _isConfined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, _isConfined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     Q_UNUSED(group);
 
@@ -696,9 +702,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, confined, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, confined, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     Q_UNUSED(group);
 
@@ -717,9 +723,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, false, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, false, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QVERIFY(!group->isValid());
 }
@@ -734,9 +740,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, false, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, false, _rootPath,
         downloadsStruct, _algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QVERIFY(group->isValid());
 }
@@ -751,9 +757,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", "sasaas"));
 
-    GroupDownload* group = new GroupDownload(_id, _path, false, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, false, _rootPath,
         downloadsStruct, "wrong", _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QVERIFY(!group->isValid());
 }
@@ -782,9 +788,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", "sasa"));
 
-    GroupDownload* group = new GroupDownload(_id, _path, false, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, false, _rootPath,
         downloadsStruct, algo, _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QVERIFY(group->isValid());
 }
@@ -792,7 +798,7 @@
 void
 TestGroupDownload::testInvalidFilePresent() {
     QString filePath = testDirectory() + QDir::separator() + "test_file.jpg";
-    QFile* file = new QFile(filePath);
+    QScopedPointer<QFile> file(new QFile(filePath));
     file->open(QIODevice::ReadWrite | QFile::Append);
     file->write("data data data!");
     file->close();
@@ -805,9 +811,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, false, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, false, _rootPath,
         downloadsStruct, "md5", _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QVERIFY(!group->isValid());
 }
@@ -824,9 +830,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, false, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, false, _rootPath,
         downloadsStruct, "md5", _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QVERIFY(group->isValid());
 }
@@ -858,9 +864,9 @@
     downloadsStruct.append(GroupDownloadStruct("http://reddit.com",
         "other_reddit_local_file", ""));
 
-    GroupDownload* group = new GroupDownload(_id, _path, false, _rootPath,
+    QScopedPointer<GroupDownload> group(new GroupDownload(_id, _path, false, _rootPath,
         downloadsStruct, "md5", _isGSMDownloadAllowed, _metadata, _headers,
-        _downloadFactory, _fileManager);
+        _downloadFactory, _fileManager));
 
     QVERIFY(!group->isValid());
 }

=== modified file 'ubuntu-download-manager-tests/downloads/test_group_download.h'
--- ubuntu-download-manager-tests/downloads/test_group_download.h	2013-11-28 11:46:34 +0000
+++ ubuntu-download-manager-tests/downloads/test_group_download.h	2013-12-18 10:06:42 +0000
@@ -96,7 +96,6 @@
     UuidFactory* _uuidFactory;
     FakeAppArmor* _apparmor;
     FakeSystemNetworkInfo* _networkInfo;
-    FakeProcessFactory* _processFactory;
     FakeDownloadFactory* _downloadFactory;
     FakeFileManager* _fileManager;
 };

=== modified file 'ubuntu-download-manager-tests/fakes/fake_apparmor.cpp'
--- ubuntu-download-manager-tests/fakes/fake_apparmor.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/fakes/fake_apparmor.cpp	2013-12-18 10:06:42 +0000
@@ -34,8 +34,8 @@
         QList<QObject*> inParams;
 
         QList<QObject*> outParams;
-        outParams.append(new StringWrapper(id));
-        outParams.append(new StringWrapper(dbusPath));
+        outParams.append(new StringWrapper(id, this));
+        outParams.append(new StringWrapper(dbusPath, this));
         MethodParams params(inParams, outParams);
         MethodData methodData("getDBusPath", params);
         _called.append(methodData);
@@ -63,13 +63,13 @@
     isConfined = _isConfined;
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new StringWrapper(id));
-        inParams.append(new StringWrapper(connName));
+        inParams.append(new StringWrapper(id, this));
+        inParams.append(new StringWrapper(connName, this));
 
         QList<QObject*> outParams;
-        outParams.append(new StringWrapper(id));
-        outParams.append(new StringWrapper(dbusPath));
-        outParams.append(new StringWrapper(localPath));
+        outParams.append(new StringWrapper(id, this));
+        outParams.append(new StringWrapper(dbusPath, this));
+        outParams.append(new StringWrapper(localPath, this));
         MethodParams params(inParams, outParams);
         MethodData methodData("getSecurePath", params);
         _called.append(methodData);

=== modified file 'ubuntu-download-manager-tests/fakes/fake_application.cpp'
--- ubuntu-download-manager-tests/fakes/fake_application.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/fakes/fake_application.cpp	2013-12-18 10:06:42 +0000
@@ -27,7 +27,7 @@
 FakeApplication::exit(int returnCode) {
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new IntWrapper(returnCode));
+        inParams.append(new IntWrapper(returnCode, this));
 
         QList<QObject*> outParams;
         MethodParams params(inParams, outParams);

=== modified file 'ubuntu-download-manager-tests/fakes/fake_download.cpp'
--- ubuntu-download-manager-tests/fakes/fake_download.cpp	2013-11-27 13:29:03 +0000
+++ ubuntu-download-manager-tests/fakes/fake_download.cpp	2013-12-18 10:06:42 +0000
@@ -66,7 +66,7 @@
 FakeDownload::setThrottle(qulonglong speed) {
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new UintWrapper(speed));
+        inParams.append(new UintWrapper(speed, this));
 
         QList<QObject*> outParams;
         MethodParams params(inParams, outParams);

=== modified file 'ubuntu-download-manager-tests/fakes/fake_download_factory.cpp'
--- ubuntu-download-manager-tests/fakes/fake_download_factory.cpp	2013-11-28 13:18:20 +0000
+++ ubuntu-download-manager-tests/fakes/fake_download_factory.cpp	2013-12-18 10:06:42 +0000
@@ -44,7 +44,7 @@
     QString id = _apparmor->getSecurePath(downloadOwner, dbusPath, rootPath,
         isConfined);
     Download* down = new FakeDownload(id, dbusPath, isConfined, rootPath, url,
-        metadata, headers);
+        metadata, headers, this);
     _downloads.append(down);
     qDebug() << "Downloads count" << _downloads.count();
     return down;
@@ -69,7 +69,7 @@
     QString id = _apparmor->getSecurePath(downloadOwner, dbusPath, rootPath,
         isConfined);
     Download* down = new FakeDownload(id, dbusPath, isConfined, rootPath, url,
-        hash, algo, metadata, headers);
+        hash, algo, metadata, headers, this);
     _downloads.append(down);
     qDebug() << "Downloads count" << _downloads.count();
     return down;
@@ -97,7 +97,7 @@
     QString id = _apparmor->getSecurePath(downloadOwner, dbusPath, rootPath,
         isConfined);
     Download* down = new FakeDownload(id, dbusPath, isConfined, rootPath,
-        QUrl(), "", algo, metadata, headers);
+        QUrl(), "", algo, metadata, headers, this);
     _downloads.append(down);
     qDebug() << "Downloads count" << _downloads.count();
     return down;
@@ -119,7 +119,7 @@
     QString dbusPath;
     _apparmor->getDBusPath(id, dbusPath);
     Download* down = new FakeDownload(id, dbusPath, isConfined, rootPath,
-        url, metadata, headers);
+        url, metadata, headers, this);
     _downloads.append(down);
     qDebug() << "Downloads count" << _downloads.count();
     return down;
@@ -137,7 +137,7 @@
     QString dbusPath;
     _apparmor->getDBusPath(id, dbusPath);
     Download* down = new FileDownload(id, dbusPath, isConfined,
-        rootPath, url, hash, algo, metadata, headers);
+        rootPath, url, hash, algo, metadata, headers, this);
     _downloads.append(down);
     qDebug() << "Downloads count" << _downloads.count();
     return down;

=== modified file 'ubuntu-download-manager-tests/fakes/fake_file_manager.cpp'
--- ubuntu-download-manager-tests/fakes/fake_file_manager.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/fakes/fake_file_manager.cpp	2013-12-18 10:06:42 +0000
@@ -27,7 +27,7 @@
 FakeFileManager::remove(const QString& path) {
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new StringWrapper(path));
+        inParams.append(new StringWrapper(path, this));
 
         QList<QObject*> outParams;
         MethodParams params(inParams, outParams);

=== modified file 'ubuntu-download-manager-tests/fakes/fake_network_reply.cpp'
--- ubuntu-download-manager-tests/fakes/fake_network_reply.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/fakes/fake_network_reply.cpp	2013-12-18 10:06:42 +0000
@@ -37,7 +37,7 @@
 }
 
 FakeNetworkReply::FakeNetworkReply(QObject *parent)
-    : NetworkReply(new FakeQNetworkReply(parent)),
+    : NetworkReply(new FakeQNetworkReply(), parent),
       Fake() {
 }
 
@@ -74,7 +74,7 @@
 FakeNetworkReply::setReadBufferSize(uint size) {
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new UintWrapper(size));
+        inParams.append(new UintWrapper(size, this));
 
         QList<QObject*> outParams;
         MethodParams params(inParams, outParams);
@@ -104,10 +104,10 @@
 FakeNetworkReply::canIgnoreSslErrors(const QList<QSslError>& errors) {
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new SslErrorsListWrapper(errors));
+        inParams.append(new SslErrorsListWrapper(errors, this));
 
         QList<QObject*> outParams;
-        outParams.append(new BoolWrapper(_canIgnoreSsl));
+        outParams.append(new BoolWrapper(_canIgnoreSsl, this));
         MethodParams params(inParams, outParams);
         MethodData methodData("canIgnoreSslErrors", params);
         _called.append(methodData);

=== modified file 'ubuntu-download-manager-tests/fakes/fake_process.cpp'
--- ubuntu-download-manager-tests/fakes/fake_process.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/fakes/fake_process.cpp	2013-12-18 10:06:42 +0000
@@ -44,9 +44,9 @@
                    QProcess::OpenMode mode) {
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new StringWrapper(program));
-        inParams.append(new StringListWrapper(arguments));
-        inParams.append(new OpenModeWrapper(mode));
+        inParams.append(new StringWrapper(program, this));
+        inParams.append(new StringListWrapper(arguments, this));
+        inParams.append(new OpenModeWrapper(mode, this));
 
         QList<QObject*> outParams;
         MethodParams params(inParams, outParams);

=== modified file 'ubuntu-download-manager-tests/fakes/fake_process_factory.cpp'
--- ubuntu-download-manager-tests/fakes/fake_process_factory.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/fakes/fake_process_factory.cpp	2013-12-18 10:06:42 +0000
@@ -26,7 +26,7 @@
 
 Process*
 FakeProcessFactory::createProcess() {
-    FakeProcess* process = new FakeProcess();
+    FakeProcess* process = new FakeProcess(this);
 
     if (_recording) {
         QList<QObject*> inParams;

=== modified file 'ubuntu-download-manager-tests/fakes/fake_request_factory.cpp'
--- ubuntu-download-manager-tests/fakes/fake_request_factory.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/fakes/fake_request_factory.cpp	2013-12-18 10:06:42 +0000
@@ -38,11 +38,11 @@
 NetworkReply*
 FakeRequestFactory::get(const QNetworkRequest& request) {
     // return a FakeQNetworkReply
-    FakeNetworkReply* reply = new FakeNetworkReply();
+    FakeNetworkReply* reply = new FakeNetworkReply(this);
 
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new RequestWrapper(request));
+        inParams.append(new RequestWrapper(request, this));
 
         QList<QObject*> outParams;
         outParams.append(reply);

=== modified file 'ubuntu-download-manager-tests/fakes/fake_sm_file_download.cpp'
--- ubuntu-download-manager-tests/fakes/fake_sm_file_download.cpp	2013-11-11 16:14:46 +0000
+++ ubuntu-download-manager-tests/fakes/fake_sm_file_download.cpp	2013-12-18 10:06:42 +0000
@@ -58,7 +58,7 @@
 FakeSMFileDownload::emitError(QString error) {
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new StringWrapper(error));
+        inParams.append(new StringWrapper(error, this));
 
         QList<QObject*> outParams;
         MethodParams params(inParams, outParams);
@@ -71,7 +71,7 @@
 FakeSMFileDownload::emitNetworkError(QNetworkReply::NetworkError code) {
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new NetworkErrorWrapper(code));
+        inParams.append(new NetworkErrorWrapper(code, this));
 
         QList<QObject*> outParams;
         MethodParams params(inParams, outParams);
@@ -84,7 +84,7 @@
 FakeSMFileDownload::emitSslError(const QList<QSslError>& errors) {
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new SslErrorsWrapper(errors));
+        inParams.append(new SslErrorsWrapper(errors, this));
 
         QList<QObject*> outParams;
         MethodParams params(inParams, outParams);

=== modified file 'ubuntu-download-manager-tests/fakes/fake_timer.cpp'
--- ubuntu-download-manager-tests/fakes/fake_timer.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/fakes/fake_timer.cpp	2013-12-18 10:06:42 +0000
@@ -29,7 +29,7 @@
         QList<QObject*> inParams;
 
         QList<QObject*> outParams;
-        outParams.append(new BoolWrapper(_isActive));
+        outParams.append(new BoolWrapper(_isActive, this));
 
         MethodParams params(inParams, outParams);
         MethodData methodData("isActive", params);
@@ -47,7 +47,7 @@
 FakeTimer::start(int msec) {
     if (_recording) {
         QList<QObject*> inParams;
-        inParams.append(new IntWrapper(msec));
+        inParams.append(new IntWrapper(msec, this));
 
         QList<QObject*> outParams;