Merge lp:~dobey/unity-scope-click/no-more-click into lp:unity-scope-click

[dobey]

Remove deps on ubuntu-download-manager and libclick.
Remove download-manager, installing, uninstalling, and reviews code.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:504
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/130/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1248/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1255
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1038/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1038/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1038/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1038/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1038/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1038/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/130/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:505
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/131/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1249/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1256
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1039/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1039/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1039/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1039/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1039/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1039/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/131/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:506
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/134/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1256/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1263
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1046/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1046/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1046/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1046/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1046/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1046/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/134/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:506
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/135/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1261/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1268
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1051/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1051/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1051/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1051/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1051/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1051/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/135/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:507
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/136/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1262
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1269
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1052
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1052/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1052
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1052/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1052
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1052/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1052
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1052/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1052
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1052/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1052
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1052/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/136/rebuild

review: Approve (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:507
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/137/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1311/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1318/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/137/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:508
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/138/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1312
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1319
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1096
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1096/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1096
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1096/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1096
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1096/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1096
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1096/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1096
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1096/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1096
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1096/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/138/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-02 18:37:59 +0000
+++ CMakeLists.txt	2017-01-10 16:06:37 +0000
@@ -26,9 +26,6 @@
 pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2>=0.9 gobject-2.0)
 add_definitions(${UAL_CFLAGS} ${UAL_CFLAGS_OTHER})
 
-pkg_check_modules(CLICK REQUIRED click-0.4)
-add_definitions(${CLICK_CFLAGS} ${CLICK_CFLAGS_OTHER})
-
 pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.6.7 libunity-api>=0.1.3)
 add_definitions(${UNITY_SCOPES_CFLAGS} ${UNITY_SCOPES_CFLAGS_OTHER})
 
@@ -38,9 +35,6 @@
 pkg_check_modules(UBUNTUONE REQUIRED ubuntuoneauth-2.0>=15.10)
 add_definitions(${UBUNTUONE_CFLAGS} ${UBUNTUONE_CFLAGS_OTHER})
 
-pkg_check_modules(UBUNTU_DOWNLOAD_MANAGER_CLIENT REQUIRED ubuntu-download-manager-client)
-pkg_check_modules(UBUNTU_DOWNLOAD_MANAGER_COMMON REQUIRED ubuntu-download-manager-common)
-
 SET (SCOPE_LIB_VERSION 0.2.0)
 SET (SCOPE_LIB_SOVERSION 0)
 SET (SCOPE_LIB_API_VERSION 2.0)
@@ -50,7 +44,6 @@
 
 # Add our own subdirectories.
 add_subdirectory(tests)
-add_subdirectory(bin)
 add_subdirectory(libclickscope)
 add_subdirectory(scope)
 add_subdirectory(data)

=== removed directory 'bin'
=== removed file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2016-10-25 13:12:57 +0000
+++ bin/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-install(PROGRAMS install-helper DESTINATION lib/unity-scope-click/)

=== removed file 'bin/install-helper'
--- bin/install-helper	2014-06-20 05:09:01 +0000
+++ bin/install-helper	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2014 Canonical Ltd.
-# 
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-#
-
-FILE_NAME="$1"
-PACKAGE_NAME="$2"
-
-SCOPES_OBJECTPATH=/com/canonical/unity/scopes
-SCOPES_INTERFACE=com.canonical.unity.scopes
-SCOPES_METHOD=InvalidateResults
-
-LAUNCHER_BUS=com.ubuntu.unity.launcher
-LAUNCHER_OBJECTPATH=/com/ubuntu/unity/launcher/installations
-LAUNCHER_INTERFACE=com.ubuntu.unity.launcher.Installations
-LAUNCHER_METHOD=completeInstallation
-
-function invalidate-scope {
-    SCOPE_ID=$1
-    dbus-send $SCOPES_OBJECTPATH $SCOPES_INTERFACE.$SCOPES_METHOD string:$SCOPE_ID
-}
-
-function install-package {
-    FILE_NAME="$1"
-    pkcon -p install-local "$FILE_NAME"
-}
-
-function app_id-from-package_name {
-    PACKAGE_NAME=$1
-    IFS=_
-    TRIPLET=($(ubuntu-app-triplet $PACKAGE_NAME))
-    unset IFS
-    echo ${TRIPLET[0]}_${TRIPLET[1]}_current-user-version
-}
-
-function complete-installation {
-    PACKAGE_NAME=$1
-    APP_ID=$2
-    dbus-send --dest=$LAUNCHER_BUS --type=method_call $LAUNCHER_OBJECTPATH $LAUNCHER_INTERFACE.$LAUNCHER_METHOD string:$PACKAGE_NAME string:$APP_ID
-}
-
-if install-package "$FILE_NAME" ; then
-    invalidate-scope clickscope
-    invalidate-scope com.canonical.scopes.clickstore
-    APP_ID=$(app_id-from-package_name $PACKAGE_NAME)
-    complete-installation $PACKAGE_NAME $APP_ID
-else
-    PKCON_STATUS=$?
-    NO_APP_ID=""
-    complete-installation $PACKAGE_NAME $NO_APP_ID
-    exit $PKCON_STATUS
-fi

=== modified file 'debian/control'
--- debian/control	2016-12-21 15:27:35 +0000
+++ debian/control	2017-01-10 16:06:37 +0000
@@ -12,24 +12,19 @@
                intltool,
                lcov,
                libboost-locale-dev,
-               libclick-0.4-dev,
                libglib2.0-dev (>= 2.32),
                libjsoncpp-dev,
                libubuntu-app-launch2-dev (>= 0.9),
-               libubuntu-download-manager-client-dev (>= 0.3+14.10.20140430-0ubuntu1),
-               libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntuoneauth-2.0-dev (>= 15.10),
                libunity-api-dev (>= 7.80.7),
                libunity-scopes-dev (>= 0.6.7~),
                libgsettings-qt-dev,
-               ubuntu-sdk-libs,
                pkg-config,
                python3-all:native,
                python3-fixtures,
                python3-scope-harness (>= 0.5.8),
                python3-testtools,
                xvfb,
-               ubuntu-download-manager,
 Maintainer: Ubuntu Developers <[e-mail]>
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/unity-scope-click
@@ -42,10 +37,6 @@
 Depends: account-plugin-ubuntuone,
          libglib2.0-bin,
          libsqlite3-0 (>= 3.8.5),
-         packagekit,
-         packagekit-tools,
-         ubuntu-app-launch-tools,
-         ubuntu-download-manager,
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: unity (<< 7.0),

=== modified file 'debian/unity-scope-click.install'
--- debian/unity-scope-click.install	2016-11-04 20:17:19 +0000
+++ debian/unity-scope-click.install	2017-01-10 16:06:37 +0000
@@ -1,5 +1,4 @@
 usr/lib/*/unity-scopes/*
-usr/lib/unity-scope-click/*
 usr/share/unity/scopes/clickapps/*.jpg
 usr/share/unity/scopes/clickapps/*.png
 usr/share/unity/scopes/clickapps/*.svg

=== modified file 'libclickscope/click/CMakeLists.txt'
--- libclickscope/click/CMakeLists.txt	2016-10-24 21:26:23 +0000
+++ libclickscope/click/CMakeLists.txt	2017-01-10 16:06:37 +0000
@@ -8,13 +8,11 @@
 add_definitions(
   -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
   -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}\"
-  -DCLICK_INSTALL_HELPER=\"${CMAKE_INSTALL_PREFIX}/lib/unity-scope-click/install-helper\"
   ${GSETTINGS_QT_CFLAGS} ${GSETTINGS_QT_OTHER}
 )
 
 add_library(${SCOPE_LIB_NAME} STATIC
   configuration.cpp
-  download-manager.cpp
   department-lookup.cpp
   departments.cpp
   departments-db.cpp
@@ -25,7 +23,6 @@
   network_access_manager.cpp
   package.cpp
   preview.cpp
-  reviews.cpp
   qtbridge.cpp
   scope_activation.cpp
   smartconnect.cpp
@@ -38,22 +35,16 @@
 
 include_directories(
   ${JSON_CPP_INCLUDE_DIRS}
-  ${LIBPAY_INCLUDE_DIRS}
   ${GSETTINGS_QT_INCLUDE_DIRS}
   ${UAL_INCLUDE_DIRS}
-  ${CLICK_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libclickscope
 )
 
 target_link_libraries (${SCOPE_LIB_NAME}
   ${JSON_CPP_LDFLAGS}
-  ${LIBPAY_LDFLAGS}
   ${UNITY_SCOPES_LDFLAGS}
   ${UBUNTUONE_LDFLAGS}
-  ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
-  ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
   ${GSETTINGS_QT_LIBRARIES}
   ${UAL_LDFLAGS}
-  ${CLICK_LDFLAGS}
   -lboost_locale
 )

=== removed file 'libclickscope/click/download-manager.cpp'
--- libclickscope/click/download-manager.cpp	2016-05-10 13:42:12 +0000
+++ libclickscope/click/download-manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2014-2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#include "download-manager.h"
-
-#include <QDebug>
-#include <QObject>
-#include <QString>
-#include <QStringBuilder>
-#include <QTimer>
-
-#include <click/qtbridge.h>
-
-namespace u1 = UbuntuOne;
-#include <click/ubuntuone_credentials.h>
-#include <token.h>
-
-namespace udm = Ubuntu::DownloadManager;
-#include <ubuntu/download_manager/download_struct.h>
-#include <ubuntu/download_manager/downloads_list.h>
-#include <ubuntu/download_manager/download.h>
-#include <ubuntu/download_manager/error.h>
-
-namespace click
-{
-
-static const QString DOWNLOAD_APP_ID_KEY = "app_id";
-static const QString DOWNLOAD_COMMAND_KEY = "post-download-command";
-
-static const QString DOWNLOAD_COMMAND = CLICK_INSTALL_HELPER;
-
-static const QString DOWNLOAD_MANAGER_SHA512 = "sha512";
-
-const QByteArray& CLICK_TOKEN_HEADER()
-{
-    static const QByteArray result("X-Click-Token");
-    return result;
-}
-
-DownloadManager::DownloadManager(const QSharedPointer<click::web::Client>& client,
-                                 const QSharedPointer<udm::Manager>& manager) :
-    client(client),
-    dm(manager)
-{
-}
-
-DownloadManager::~DownloadManager()
-{
-}
-
-void DownloadManager::get_progress(const std::string& package_name,
-                                   const std::function<void (std::string)>& callback)
-{
-    dm->getAllDownloadsWithMetadata(DOWNLOAD_APP_ID_KEY,
-                                    QString::fromStdString(package_name),
-                                    [callback, package_name](const QString& /*key*/, const QString& /*value*/, DownloadsList* downloads_list){
-        // got downloads matching metadata
-        std::string object_path;
-        auto downloads = downloads_list->downloads();
-        if (downloads.size() > 0) {
-            auto download = downloads.at(0);
-            object_path = download->id().toStdString();
-        }
-        qDebug() << "Found object path" << QString::fromStdString(object_path)
-                 << "for package" << QString::fromStdString(package_name);
-        if (downloads.size() > 1) {
-            qWarning() << "More than one download with the same object path";
-        }
-        callback(object_path);
-    }, [callback, package_name](const QString& /*key*/, const QString& /*value*/, DownloadsList* /*downloads_list*/){
-        // no downloads found
-        qDebug() << "No object path found for package" << QString::fromStdString(package_name);
-        callback("");
-    });
-}
-
-click::web::Cancellable DownloadManager::start(const std::string& url,
-                                               const std::string& download_sha512,
-                                               const std::string& package_name,
-                                               const std::function<void (std::string, Error)>& callback)
-{
-    QSharedPointer<click::web::Response> response = client->call
-        (url, "HEAD", true);
-
-    QObject::connect(response.data(), &click::web::Response::finished,
-                     [this, callback, url, download_sha512, package_name,
-                      response](QString) {
-                    auto status = response->get_status_code();
-                    if (status == 200) {
-                        auto clickToken = response->get_header(CLICK_TOKEN_HEADER().data());
-                        qDebug() << "Received click token:" << clickToken.c_str();
-                        QVariantMap metadata;
-
-                        QVariant commandline = QVariant(QStringList() << DOWNLOAD_COMMAND << "$file" << package_name.c_str());
-                        metadata[DOWNLOAD_COMMAND_KEY] = commandline;
-                        metadata[DOWNLOAD_APP_ID_KEY] = package_name.c_str();
-                        metadata["package_name"] = package_name.c_str();
-
-                        QMap<QString, QString> headers;
-                        headers[CLICK_TOKEN_HEADER()] = clickToken.c_str();
-
-                        udm::DownloadStruct downloadStruct(url.c_str(),
-                                                           download_sha512.c_str(),
-                                                           DOWNLOAD_MANAGER_SHA512,
-                                                           metadata,
-                                                           headers);
-
-                        dm->createDownload(downloadStruct,
-                                           [callback](Download* download) {
-                                               if (download->isError()) {
-                                                   auto error = download->error()->errorString().toUtf8().data();
-                                                   qDebug() << "Received error from ubuntu-download-manager:" << error;
-                                                   callback(error, Error::DownloadInstallError);
-                                               } else {
-                                                   download->start();
-                                                   callback(download->id().toUtf8().data(), Error::NoError);
-                                               }
-                                           },
-                                           [callback](Download* download) {
-                                               callback(download->error()->errorString().toUtf8().data(),
-                                                        Error::DownloadInstallError);
-                                           });
-                    } else {
-                        std::string error{"Unhandled HTTP response code: "};
-                        error += status;
-                        callback(error, Error::DownloadInstallError);
-                    }
-                });
-    QObject::connect(response.data(), &click::web::Response::error,
-                     [this, callback, package_name](QString error, int error_code) {
-                         qWarning() << QStringLiteral("Network error (%1) fetching click token for:").arg(error_code) << package_name.c_str();
-                         switch(error_code) {
-                         case 401:
-                         case 403:
-                             client->invalidateCredentials();
-                             callback(error.toUtf8().data(), Error::CredentialsError);
-                             break;
-                         default:
-                             callback(error.toUtf8().data(), Error::DownloadInstallError);
-                         }
-                     });
-
-    return click::web::Cancellable(response);
-}
-
-void DownloadManager::setCredentialsService(const QSharedPointer<click::CredentialsService>& credentialsService)
-{
-    sso = credentialsService;
-}
-
-} // namespace click

=== removed file 'libclickscope/click/download-manager.h'
--- libclickscope/click/download-manager.h	2016-02-26 18:51:22 +0000
+++ libclickscope/click/download-manager.h	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2014-2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#ifndef CLICK_DOWNLOAD_MANAGER_H
-#define CLICK_DOWNLOAD_MANAGER_H
-
-#include <QDebug>
-#include <QNetworkReply>
-#include <QObject>
-#include <QString>
-
-#include <click/ubuntuone_credentials.h>
-#include <click/webclient.h>
-
-#include <ubuntu/download_manager/manager.h>
-
-using Ubuntu::DownloadManager::Download;
-
-namespace UbuntuOne
-{
-class Token;
-}
-
-namespace click
-{
-// The dbus-send command to refresh the search results in the dash.
-static const QString REFRESH_SCOPE_COMMAND = QStringLiteral("dbus-send /com/canonical/unity/scopes com.canonical.unity.scopes.InvalidateResults string:%1");
-static const QString APPS_SCOPE_ID = QStringLiteral("clickscope");
-static const QString STORE_SCOPE_ID = QStringLiteral("com.canonical.scopes.clickstore");
-
-const QByteArray& CLICK_TOKEN_HEADER();
-
-
-class DownloadManager
-{
-public:
-    enum class Error {NoError, CredentialsError, DownloadInstallError};
-
-    DownloadManager(const QSharedPointer<click::web::Client>& client,
-                    const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager);
-    virtual ~DownloadManager();
-
-    virtual void get_progress(const std::string& package_name,
-                              const std::function<void (std::string)>& callback);
-    virtual click::web::Cancellable start(const std::string& url,
-                                          const std::string& download_sha512,
-                                          const std::string& package_name,
-                                          const std::function<void (std::string,
-                                                                    Error)>& callback);
-
-    virtual void setCredentialsService(const QSharedPointer<click::CredentialsService>& credentialsService);
-
-protected:
-    QSharedPointer<click::web::Client> client;
-    QSharedPointer<Ubuntu::DownloadManager::Manager> dm;
-    QSharedPointer<click::CredentialsService> sso;
-};
-
-}
-
-#endif /* CLICK_DOWNLOAD_MANAGER_H */

=== modified file 'libclickscope/click/index.cpp'
--- libclickscope/click/index.cpp	2016-04-26 10:56:47 +0000
+++ libclickscope/click/index.cpp	2017-01-10 16:06:37 +0000
@@ -36,7 +36,6 @@
 
 #include <click/smartconnect.h>
 
-#include <click/download-manager.h>
 #include "index.h"
 #include "interface.h"
 #include "application.h"
@@ -46,48 +45,6 @@
 namespace click
 {
 
-void PackageManager::uninstall(const Package& package,
-                               std::function<void(int, std::string)> callback)
-{
-    std::string package_id = package.name + ";" + package.version + ";all;local:click";
-    std::string command = "pkcon -p remove " + package_id;
-    execute_uninstall_command(command, callback);
-}
-
-void PackageManager::execute_uninstall_command(const std::string& command,
-                                               std::function<void(int, std::string)> callback)
-{
-    QSharedPointer<QProcess> process(new QProcess());
-
-    typedef void(QProcess::*QProcessFinished)(int, QProcess::ExitStatus);
-    typedef void(QProcess::*QProcessError)(QProcess::ProcessError);
-    QObject::connect(process.data(),
-                     static_cast<QProcessFinished>(&QProcess::finished),
-                     [process, callback](int code, QProcess::ExitStatus status) {
-                         Q_UNUSED(status);
-                         qDebug() << "command finished with exit code:" << code;
-                         callback(code, process.data()->readAllStandardError().data());
-                         if (code == 0) {
-                             invalidate_results(APPS_SCOPE_ID.toUtf8().data());
-                             invalidate_results(STORE_SCOPE_ID.toUtf8().data());
-                         }
-                     } );
-    QObject::connect(process.data(),
-                     static_cast<QProcessError>(&QProcess::error),
-                     [process, callback](QProcess::ProcessError error) {
-                         qCritical() << "error running command:" << error;
-                         callback(-255 + error, process.data()->readAllStandardError().data());
-                     } );
-    qDebug() << "Running command:" << command.c_str();
-    process.data()->start(command.c_str());
-}
-
-void PackageManager::invalidate_results(const std::string& scope_id)
-{
-    QProcess::execute(REFRESH_SCOPE_COMMAND.arg(scope_id.c_str()));
-}
-
-
 Index::Index(const QSharedPointer<click::web::Client>& client,
              const QSharedPointer<Configuration> configuration) :
     client(client), configuration(configuration)

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2016-10-04 17:35:15 +0000
+++ libclickscope/click/interface.cpp	2017-01-10 16:06:37 +0000
@@ -27,8 +27,6 @@
  * files in the program, then also delete it here.
  */
 
-#include <click.h>
-
 #include "interface.h"
 
 #include <QDebug>
@@ -343,39 +341,6 @@
     return icon_id;
 }
 
-Manifest manifest_from_json(const std::string& json)
-{
-    using namespace boost::property_tree;
-
-    std::istringstream is(json);
-
-    ptree pt;
-    read_json(is, pt);
-
-    Manifest manifest;
-
-    manifest.name = pt.get<std::string>("name");
-    manifest.version = pt.get<std::string>("version");
-    manifest.removable = pt.get<bool>("_removable");
-
-    BOOST_FOREACH(ptree::value_type &sv, pt.get_child("hooks"))
-    {
-        // FIXME: "primary app or scope" for a package is not defined,
-        // we just use the first one in the manifest:
-        auto app_name = sv.second.get("desktop", "");
-        if (manifest.first_app_name.empty() && !app_name.empty()) {
-            manifest.first_app_name = sv.first;
-        }
-        auto scope_id = sv.second.get("scope", "");
-        if (manifest.first_scope_id.empty() && !scope_id.empty()) {
-            manifest.first_scope_id = manifest.name + "_" + sv.first;
-        }
-    }
-    qDebug() << "adding manifest: " << manifest.name.c_str() << manifest.version.c_str() << manifest.first_app_name.c_str();
-
-    return manifest;
-}
-
 void Interface::get_installed_packages(std::function<void(PackageSet, InterfaceError)> callback)
 {
     PackageSet packages;
@@ -391,59 +356,4 @@
     callback(packages, InterfaceError::NoError);
 }
 
-std::string Interface::get_manifest_json(const std::string &package) const
-{
-    GError* error = nullptr;
-
-    std::shared_ptr<ClickDB> clickdb{click_db_new(),
-            [](ClickDB* db){g_clear_object(&db);}};
-    click_db_read(clickdb.get(), nullptr, &error);
-    if (error != nullptr) {
-        qCritical() << "Error reading click DB:" << error->message;
-        g_error_free(error);
-        return "";
-    }
-
-    std::shared_ptr<ClickUser> clickuser{click_user_new_for_user(clickdb.get(),
-                                                                 nullptr,
-                                                                 &error),
-            [](ClickUser* cu){g_clear_object(&cu);}};
-    if (error != nullptr) {
-        qCritical() << "Error setting up click user:" << error->message;
-        g_error_free(error);
-        return "";
-    }
-
-    auto result = click_user_get_manifest_as_string(clickuser.get(),
-                                                    package.c_str(),
-                                                    &error);
-    if (error != nullptr) {
-        qCritical() << "Error getting manifest:" << error->message;
-        g_error_free(error);
-        return "";
-    }
-
-    std::string retval;
-    if (result != nullptr) {
-        retval = result;
-        g_free(result);
-    }
-    return retval;
-}
-
-void Interface::get_manifest_for_app(const std::string &app_id,
-                                     std::function<void(Manifest, InterfaceError)> callback)
-{
-    Manifest manifest;
-    InterfaceError error;
-    try {
-        manifest = manifest_from_json(get_manifest_json(app_id));
-        error = InterfaceError::NoError;
-    } catch (...) {
-        qWarning() << "Can't parse manifest for:" << QString::fromStdString(app_id);
-        error = InterfaceError::ParseError;
-    }
-    callback(manifest, error);
-}
-
 } // namespace click

=== modified file 'libclickscope/click/interface.h'
--- libclickscope/click/interface.h	2016-09-02 21:29:13 +0000
+++ libclickscope/click/interface.h	2017-01-10 16:06:37 +0000
@@ -77,8 +77,6 @@
 enum class InterfaceError {NoError, CallError, ParseError};
 typedef std::list<Manifest> ManifestList;
 
-Manifest manifest_from_json(const std::string& json);
-
 class Interface
 {
 public:
@@ -97,8 +95,6 @@
     static bool is_icon_identifier(const std::string &icon_id);
     static std::string add_theme_scheme(const std::string &filename);
     virtual void get_installed_packages(std::function<void(PackageSet, InterfaceError)> callback);
-    virtual std::string get_manifest_json(const std::string &package) const;
-    virtual void get_manifest_for_app(const std::string &app_id, std::function<void(Manifest, InterfaceError)> callback);
 };
 
 } // namespace click

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2016-10-24 21:26:23 +0000
+++ libclickscope/click/preview.cpp	2017-01-10 16:06:37 +0000
@@ -31,7 +31,6 @@
 #include <click/interface.h>
 #include "preview.h"
 #include <click/qtbridge.h>
-#include <click/download-manager.h>
 #include <click/launcher.h>
 #include <click/dbus_constants.h>
 #include <click/departments-db.h>
@@ -172,76 +171,20 @@
 }
 
 void Preview::choose_strategy(const QSharedPointer<web::Client> &client,
-                              const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
                               std::shared_ptr<click::DepartmentsDb> depts)
 {
-    strategy.reset(build_strategy(result, metadata, client, manager, depts));
-}
-
-PreviewStrategy* Preview::build_installing(const std::string& download_url,
-                                           const std::string& download_sha512,
-                                           const unity::scopes::Result& result,
-                                           const QSharedPointer<click::web::Client>& client,
-                                           const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
-                                           std::shared_ptr<click::DepartmentsDb> depts)
-{
-    return new InstallingPreview(download_url, download_sha512, result, client, manager, depts);
-}
-
+    strategy.reset(build_strategy(result, metadata, client, depts));
+}
 
 PreviewStrategy* Preview::build_strategy(const unity::scopes::Result &result,
                                          const unity::scopes::ActionMetadata &metadata,
                                          const QSharedPointer<web::Client> &client,
-                                         const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
                                          std::shared_ptr<click::DepartmentsDb> depts)
 {
-    if (metadata.scope_data().which() != scopes::Variant::Type::Null) {
-        auto metadict = metadata.scope_data().get_dict();
-
-        if (metadict.count(click::Preview::Actions::DOWNLOAD_FAILED) != 0) {
-            return new DownloadErrorPreview(result);
-        } else if (metadict.count(click::Preview::Actions::DOWNLOAD_COMPLETED) != 0  ||
-                   metadict.count(click::Preview::Actions::SHOW_INSTALLED) != 0) {
-            qDebug() << "in Scope::preview(), metadata has download_completed="
-                     << metadict.count(click::Preview::Actions::DOWNLOAD_COMPLETED)
-                     << " and close_preview="
-                     << metadict.count(click::Preview::Actions::SHOW_INSTALLED);
-
-            return new InstalledPreview(result, metadata, client, depts);
-        } else if (metadict.count("action_id") != 0  && metadict.count("download_url") != 0) {
-            std::string action_id = metadict["action_id"].get_string();
-            std::string download_url = metadict["download_url"].get_string();
-            std::string download_sha512 = metadict["download_sha512"].get_string();
-            if (action_id == click::Preview::Actions::INSTALL_CLICK) {
-                return build_installing(download_url, download_sha512, result, client, manager, depts);
-            } else {
-                qWarning() << "unexpected action id " << QString::fromStdString(action_id)
-                           << " given with download_url" << QString::fromStdString(download_url);
-                return new UninstalledPreview(result, metadata, client, depts, manager);
-            }
-        } else if (metadict.count(click::Preview::Actions::UNINSTALL_CLICK) != 0) {
-            return new UninstallConfirmationPreview(result);
-        } else if (metadict.count(click::Preview::Actions::CONFIRM_UNINSTALL) != 0) {
-            return new UninstallingPreview(result, metadata, client, manager);
-        } else if (metadict.count(click::Preview::Actions::RATED) != 0) {
-            return new InstalledPreview(result, metadata, client, depts);
-        } else if (metadict.count(click::Preview::Actions::SHOW_UNINSTALLED) != 0) {
-            return new UninstalledPreview(result, metadata, client, depts, manager);
-        } else {
-            qWarning() << "preview() called with unexpected metadata. returning uninstalled preview";
-            return new UninstalledPreview(result, metadata, client, depts, manager);
-        }
+    if (result.uri().find("scope://") == 0) {
+        return new InstalledScopePreview(result);
     } else {
-        // metadata.scope_data() is Null, so we return an appropriate "default" preview:
-        if (result.uri().find("scope://") == 0)
-        {
-            return new InstalledScopePreview(result);
-        }
-        if (result["installed"].get_bool() == true) {
-            return new InstalledPreview(result, metadata, client, depts);
-        } else {
-            return new UninstalledPreview(result, metadata, client, depts, manager);
-        }
+        return new InstalledPreview(result, metadata, client, depts);
     }
 
 }
@@ -271,7 +214,6 @@
     result(result),
     client(client),
     index(new click::Index(client)),
-    reviews(new click::Reviews(client)),
     oa_client("ubuntuone", "ubuntuone", "ubuntuone",
               scopes::OnlineAccountClient::MainLoopSelect::CreateInternalMainLoop)
 {
@@ -327,9 +269,6 @@
 void PreviewStrategy::cancelled()
 {
     index_operation.cancel();
-    reviews_operation.cancel();
-    submit_operation.cancel();
-    purchase_operation.cancel();
 }
 
 scopes::PreviewWidget PreviewStrategy::build_other_metadata(const PackageDetails &details)
@@ -396,8 +335,7 @@
 // return them from populateDetails and check them in the calling code
 // to decide whether to show error widgets. see bug LP: #1289541
 void PreviewStrategy::populateDetails(std::function<void(const click::PackageDetails& details)> details_callback,
-                              std::function<void(const click::ReviewList&,
-                                                    click::Reviews::Error)> reviews_callback, bool force_cache)
+                                      bool force_cache)
 {
 
     std::string app_name = get_string_maybe_null(result["name"]);
@@ -410,15 +348,14 @@
         details.description = get_string_maybe_null(result["description"]);
         details.main_screenshot_url = get_string_maybe_null(result["main_screenshot"]);
         details_callback(details);
-        reviews_callback(click::ReviewList(), click::Reviews::Error::NoError);
     } else {
         qDebug() << "in populateDetails(), app_name is:" << app_name.c_str();
         // I think this should not be required when we switch the click::Index over
         // to using the Qt bridge. With that, the qt dependency becomes an implementation detail
         // and code using it does not need to worry about threading/event loop topics.
-        run_under_qt([this, details_callback, reviews_callback, app_name, force_cache]()
+        run_under_qt([this, details_callback, app_name, force_cache]()
             {
-                index_operation = index->get_details(app_name, [this, app_name, details_callback, reviews_callback, force_cache](PackageDetails details, click::Index::Error error){
+                index_operation = index->get_details(app_name, [this, app_name, details_callback, force_cache](PackageDetails details, click::Index::Error error){
                     if(error == click::Index::Error::NoError) {
                         qDebug() << "Got details:" << app_name.c_str();
                         details_callback(details);
@@ -431,9 +368,6 @@
                         details.main_screenshot_url = get_string_maybe_null(result["main_screenshot"]);
                         details_callback(details);
                     }
-                    reviews_operation = reviews->fetch_reviews(app_name,
-                                                               reviews_callback,
-                                                               force_cache);
                 }, force_cache);
             });
     }
@@ -551,65 +485,6 @@
     return widgets;
 }
 
-scopes::PreviewWidgetList PreviewStrategy::reviewsWidgets(const click::ReviewList& reviewlist)
-{
-    scopes::PreviewWidgetList widgets;
-
-    scopes::PreviewWidget rating("reviews", "reviews");
-    scopes::VariantBuilder builder;
-
-    if (reviewlist.size() > 0) {
-        scopes::PreviewWidget title("reviews_title", "text");
-        title.add_attribute_value("title", scopes::Variant(_("Reviews")));
-        widgets.push_back(title);
-
-        for (const auto& kv : reviewlist) {
-            builder.add_tuple({
-                    {"rating", scopes::Variant(kv.rating)},
-                    {"author", scopes::Variant(kv.reviewer_name)},
-                    {"review", scopes::Variant(kv.review_text)}
-                });
-        }
-        rating.add_attribute_value("reviews", builder.end());
-        widgets.push_back(rating);
-    }
-
-    return widgets;
-}
-
-scopes::PreviewWidgetList PreviewStrategy::downloadErrorWidgets()
-{
-    return errorWidgets(scopes::Variant(_("Download Error")),
-                        scopes::Variant(_("Download or install failed. Please try again.")),
-                        scopes::Variant(click::Preview::Actions::SHOW_UNINSTALLED),
-                        scopes::Variant(_("Close")));
-}
-
-scopes::PreviewWidgetList PreviewStrategy::loginErrorWidgets(const std::string& download_url, const std::string& download_sha512)
-{
-    auto widgets = errorWidgets(scopes::Variant(_("Login Error")),
-                                scopes::Variant(_("Please log in to your Ubuntu One account.")),
-                                scopes::Variant(click::Preview::Actions::INSTALL_CLICK),
-                                scopes::Variant(_("Go to Accounts")));
-    auto buttons = widgets.back();
-    widgets.pop_back();
-
-    scopes::VariantBuilder builder;
-    builder.add_tuple(
-        {
-            {"id", scopes::Variant(click::Preview::Actions::INSTALL_CLICK)},
-            {"label", scopes::Variant(_("Go to Accounts"))},
-            {"download_url", scopes::Variant(download_url)},
-            {"download_sha512", scopes::Variant(download_sha512)},
-        });
-    buttons.add_attribute_value("actions", builder.end());
-    oa_client.register_account_login_item(buttons,
-                                          scopes::OnlineAccountClient::PostLoginAction::ContinueActivation,
-                                          scopes::OnlineAccountClient::PostLoginAction::DoNothing);
-    widgets.push_back(buttons);
-    return widgets;
-}
-
 scopes::PreviewWidgetList PreviewStrategy::errorWidgets(const scopes::Variant& title,
                                                 const scopes::Variant& summary,
                                                 const scopes::Variant& action_id,
@@ -639,129 +514,6 @@
     return widgets;
 }
 
-void PreviewStrategy::invalidateScope(const std::string& scope_id)
-{
-    run_under_qt([scope_id]() {
-            PackageManager::invalidate_results(scope_id);
-        });
-}
-
-// class DownloadErrorPreview
-
-DownloadErrorPreview::DownloadErrorPreview(const unity::scopes::Result &result)
-    : PreviewStrategy(result)
-{
-}
-
-DownloadErrorPreview::~DownloadErrorPreview()
-{
-
-}
-
-void DownloadErrorPreview::run(const unity::scopes::PreviewReplyProxy &reply)
-{
-    // NOTE: no details used by downloadErrorWidgets(), so no need to
-    // call populateDetails() here.
-    reply->push(downloadErrorWidgets());
-}
-
-// class InstallingPreview
-
-InstallingPreview::InstallingPreview(const std::string &download_url,
-                                     const std::string &download_sha512,
-                                     const unity::scopes::Result &result,
-                                     const QSharedPointer<click::web::Client>& client,
-                                     const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
-                                     std::shared_ptr<click::DepartmentsDb> depts) :
-    PreviewStrategy(result, client),
-    DepartmentUpdater(depts),
-    download_url(download_url),
-    download_sha512(download_sha512),
-    dm(new DownloadManager(client, manager)),
-    depts_db(depts)
-{
-}
-
-InstallingPreview::~InstallingPreview()
-{
-}
-
-void InstallingPreview::startLauncherAnimation(const PackageDetails &details)
-{
-    Launcher l(LAUNCHER_BUSNAME, LAUNCHER_OBJECT_PATH, QDBusConnection::sessionBus());
-    l.startInstallation(QString::fromStdString(details.package.title),
-                        QString::fromStdString(details.package.icon_url),
-                        QString::fromStdString(details.package.name));
-
-}
-
-void InstallingPreview::run(const unity::scopes::PreviewReplyProxy &reply)
-{
-    qDebug() << "Starting installation" << QString(download_url.c_str()) << QString(download_sha512.c_str());
-    std::promise<bool> promise;
-    auto future = promise.get_future();
-    run_under_qt([this, reply, &promise]() {
-            dm->start(download_url, download_sha512, result["name"].get_string(),
-                      [this, reply, &promise] (std::string msg, DownloadManager::Error dmerr){
-                          switch (dmerr)
-                          {
-                          case DownloadManager::Error::DownloadInstallError:
-                              qWarning() << "Error received from UDM during startDownload:" << msg.c_str();
-                              reply->push(downloadErrorWidgets());
-                              promise.set_value(false);
-                              break;
-                          case DownloadManager::Error::CredentialsError:
-                              qWarning() << "InstallingPreview got error in getting credentials during startDownload";
-                              reply->push(loginErrorWidgets(download_url, download_sha512));
-                              promise.set_value(false);
-                              break;
-                          case DownloadManager::Error::NoError: {
-                              std::string object_path = msg;
-                              qDebug() << "Successfully created UDM Download.";
-                              populateDetails([this, reply, object_path](const PackageDetails &details) {
-                                      store_department(details);
-                                      pushPackagePreviewWidgets(cachedWidgets, details, progressBarWidget(object_path));
-                                      startLauncherAnimation(details);
-                                  },
-                                  [this, reply, &promise](const ReviewList& reviewlist,
-                                                          click::Reviews::Error error) {
-                                      if (error == click::Reviews::Error::NoError) {
-                                          auto const revs = reviewsWidgets(reviewlist);
-                                          cachedWidgets.push(revs);
-                                          cachedWidgets.layout.appendToColumn(cachedWidgets.layout.singleColumn.column1, revs);
-                                          cachedWidgets.layout.appendToColumn(cachedWidgets.layout.twoColumns.column1, revs);
-                                      } else {
-                                          qDebug() << "There was an error getting reviews for:" << result["name"].get_string().c_str();
-                                      }
-                                      cachedWidgets.flush(reply);
-                                      promise.set_value(true);
-                                  });
-                              break;
-                          }
-                          default:
-                              qCritical() << "Unknown error occurred downloading.";
-                              promise.set_value(false);
-                              break;
-                          }
-                      });
-        });
-    future.get();
-    reply->finished();
-}
-
-scopes::PreviewWidgetList PreviewStrategy::progressBarWidget(const std::string& object_path)
-{
-    scopes::PreviewWidgetList widgets;
-    scopes::PreviewWidget progress("download", "progress");
-    scopes::VariantMap tuple;
-    tuple["dbus-name"] = "com.canonical.applications.Downloader";
-    tuple["dbus-object"] = object_path;
-    progress.add_attribute_value("source", scopes::Variant(tuple));
-    widgets.push_back(progress);
-
-    return widgets;
-}
-
 // class InstalledPreview
 
 InstalledPreview::InstalledPreview(const unity::scopes::Result& result,
@@ -778,163 +530,18 @@
 {
 }
 
-std::string InstalledPreview::get_consumer_key()
-{
-    std::promise<std::string> promise;
-    auto future = promise.get_future();
-    QSharedPointer<click::CredentialsService> sso;
-
-    qt::core::world::enter_with_task([this, &sso, &promise]() {
-            sso.reset(new click::CredentialsService());
-
-            QObject::connect(sso.data(), &click::CredentialsService::credentialsFound,
-                    [&promise, &sso](const UbuntuOne::Token& token) {
-                    qDebug() << "Credentials found";
-                    sso.clear();
-                    try {
-                        promise.set_value(token.consumerKey().toStdString());
-                    } catch (const std::future_error&) {
-                        // Ignore promise_already_satisfied
-                    }
-                });
-            QObject::connect(sso.data(), &click::CredentialsService::credentialsNotFound,
-                    [&promise, &sso]() {
-                    qDebug() << "No credentials found";
-                    sso.clear();
-                    try {
-                        promise.set_value("");
-                    } catch (const std::future_error&) {
-                        // Ignore promise_already_satisfied
-                    }
-                    });
-
-            sso->getCredentials();
-            qDebug() << "getCredentials finished";
-        });
-    return future.get();
-}
-
-scopes::PreviewWidget InstalledPreview::createRatingWidget(const click::Review& review) const
-{
-    scopes::PreviewWidget rating("rating", "rating-input");
-
-    if (review.id != 0) {
-        qDebug() << "Review for current user already exists, review id:" << review.id;
-        rating = scopes::PreviewWidget(std::to_string(review.id), "rating-edit"); // pass review id via widget id
-        rating.add_attribute_value("review", scopes::Variant(review.review_text));
-        rating.add_attribute_value("rating", scopes::Variant(review.rating));
-        rating.add_attribute_value("author", scopes::Variant(review.reviewer_name));
-    }
-
-    return rating;
-}
-
 void InstalledPreview::run(unity::scopes::PreviewReplyProxy const& reply)
 {
     const bool force_cache = (metadata.internet_connectivity() == scopes::QueryMetadata::ConnectivityStatus::Disconnected);
     qDebug() << "preview, force_cache=" << force_cache << ", conn status=" << (int)metadata.internet_connectivity();
 
-    // Check if the user is submitting a rating, so we can submit it.
-    Review review;
-    review.rating = 0;
-    std::string widget_id;
-    // We use a try/catch here, as scope_data() can be a dict, but not have
-    // the values we need, which will result in an exception thrown.
-    try {
-        auto metadict = metadata.scope_data().get_dict();
-        review.rating = metadict["rating"].get_int();
-        review.review_text = metadict["review"].get_string();
-        widget_id = metadict["widget_id"].get_string();
-    } catch(...) {
-        // Do nothing as we are not submitting a review.
-    }
-
-    auto userid = get_consumer_key();
-
-    //
     // Get the click manifest.
     Manifest manifest;
-    std::promise<Manifest> manifest_promise;
-    std::future<Manifest> manifest_future = manifest_promise.get_future();
     std::string app_name = result["name"].get_string();
-    if (!app_name.empty() && !std::regex_match(app_name, desktop_match)) {
-        qt::core::world::enter_with_task([&]() {
-            click::Interface().get_manifest_for_app(app_name,
-                [&](Manifest found_manifest, InterfaceError error) {
-                    qDebug() << "Got manifest for:" << app_name.c_str();
-
-                    // Fill in required data about the package being reviewed.
-                    review.package_name = found_manifest.name;
-                    review.package_version = found_manifest.version;
-
-                    if (error != click::InterfaceError::NoError) {
-                        qDebug() << "There was an error getting the manifest for:" << app_name.c_str();
-                    }
-                    manifest_promise.set_value(found_manifest);
-            });
-        });
-        manifest = manifest_future.get();
-        if (review.rating > 0) {
-            std::promise<bool> submit_promise;
-            std::future<bool> submit_future = submit_promise.get_future();
-            qt::core::world::enter_with_task([this, review, &submit_promise, widget_id]() mutable {
-                    if (widget_id == "rating") {
-                        submit_operation = reviews->submit_review(review,
-                                                              [&submit_promise](click::Reviews::Error){
-                                                                  // TODO: Need to handle errors properly.
-                                                                  submit_promise.set_value(true);
-                                                              });
-
-                    } else {
-                        try {
-                            review.id = std::stoul(widget_id);
-                            qDebug() << "Updating review" << review.id << "with '" << QString::fromStdString(review.review_text) << "'";
-                            submit_operation = reviews->edit_review(review,
-                                                                [&submit_promise](click::Reviews::Error){
-                                                                    // TODO: Need to handle errors properly.
-                                                                    submit_promise.set_value(true);
-                                                                });
-                        } catch (const std::exception &e) {
-                            qWarning() << "Failed to update review:" << QString::fromStdString(e.what()) << " review widget:" << QString::fromStdString(widget_id);
-                            submit_promise.set_value(false);
-                        }
-                }
-            });
-            submit_future.get();
-        }
-    }
     populateDetails([this, reply, manifest, app_name](const PackageDetails &details){
             cachedDetails = details;
             store_department(details);
             pushPackagePreviewWidgets(cachedWidgets, details, createButtons(manifest));
-        },
-        [this, reply, &review, manifest, userid](const ReviewList& reviewlist,
-                                                 click::Reviews::Error error) {
-            auto reviews = bring_to_front(reviewlist, userid);
-            if (manifest.removable && !cachedDetails.download_url.empty()) {
-                scopes::PreviewWidgetList review_input;
-                bool has_reviewed = reviews.size() > 0 && reviews.front().reviewer_username == userid;
-
-                Review existing_review;
-                existing_review.id = 0;
-                if (has_reviewed) {
-                    existing_review = reviews.front();
-                    reviews.pop_front();
-                }
-                review_input.push_back(createRatingWidget(existing_review));
-                cachedWidgets.push(review_input);
-                cachedWidgets.layout.appendToColumn(cachedWidgets.layout.singleColumn.column1, review_input);
-                cachedWidgets.layout.appendToColumn(cachedWidgets.layout.twoColumns.column1, review_input);
-            }
-
-            if (error == click::Reviews::Error::NoError) {
-                auto const revs = reviewsWidgets(reviews);
-                cachedWidgets.push(revs);
-                cachedWidgets.layout.appendToColumn(cachedWidgets.layout.singleColumn.column1, revs);
-                cachedWidgets.layout.appendToColumn(cachedWidgets.layout.twoColumns.column1, revs);
-            } else {
-                qDebug() << "There was an error getting reviews for:" << result["name"].get_string().c_str();
-            }
             cachedWidgets.flush(reply);
             reply->finished();
         }, force_cache);
@@ -965,16 +572,6 @@
         qDebug() << "Adding button" << QString::fromStdString(open_label) << "-"
                  << QString::fromStdString(uri);
     }
-    if (manifest.removable)
-    {
-        auto price = result.contains("price") ? result["price"].get_double() : 0.00f;
-        if (price == 0.00f) {
-            builder.add_tuple({
-                {"id", scopes::Variant(click::Preview::Actions::UNINSTALL_CLICK)},
-                {"label", scopes::Variant(_("Uninstall"))}
-            });
-        }
-    }
     if (!uri.empty() || manifest.removable) {
         buttons.add_attribute_value("actions", builder.end());
         widgets.push_back(buttons);
@@ -1032,203 +629,4 @@
     reply->push({actions});
 }
 
-// class PurchasingPreview
-
-PurchasingPreview::PurchasingPreview(const unity::scopes::Result& result,
-                                     const QSharedPointer<click::web::Client>& client)
-    : PreviewStrategy(result, client)
-{
-}
-
-PurchasingPreview::~PurchasingPreview()
-{
-}
-
-void PurchasingPreview::run(unity::scopes::PreviewReplyProxy const& reply)
-{
-    populateDetails([this, reply](const PackageDetails &details){
-            reply->push(purchasingWidgets(details));
-        },
-        [this, reply](const click::ReviewList&, click::Reviews::Error) {
-            reply->finished();
-        });
-}
-
-scopes::PreviewWidgetList PurchasingPreview::purchasingWidgets(const PackageDetails &/*details*/)
-{
-    scopes::PreviewWidgetList widgets;
-    return widgets;
-}
-
-// class UninstallConfirmationPreview
-
-UninstallConfirmationPreview::UninstallConfirmationPreview(const unity::scopes::Result& result)
-    : PreviewStrategy(result)
-{
-}
-
-UninstallConfirmationPreview::~UninstallConfirmationPreview()
-{
-}
-
-void UninstallConfirmationPreview::run(unity::scopes::PreviewReplyProxy const& reply)
-{
-    // NOTE: no need to populateDetails() here.
-    scopes::PreviewWidgetList widgets;
-
-    scopes::PreviewWidget header("hdr", "header");
-    header.add_attribute_value("title", scopes::Variant(_("Confirmation")));
-    std::string title = result["title"].get_string();
-    // TRANSLATORS: Do NOT translate ${title} here.
-    std::string message = _("Uninstall ${title}?");
-    boost::replace_first(message, "${title}", title);
-    header.add_attribute_value("subtitle", scopes::Variant(message));
-    widgets.push_back(header);
-
-    scopes::PreviewWidget buttons("buttons", "actions");
-    scopes::VariantBuilder builder;
-    builder.add_tuple({
-       {"id", scopes::Variant(click::Preview::Actions::SHOW_INSTALLED)},
-       {"label", scopes::Variant(_("Cancel"))}
-    });
-    builder.add_tuple({
-       {"id", scopes::Variant(click::Preview::Actions::CONFIRM_UNINSTALL)},
-       {"label", scopes::Variant(_("Confirm"))}
-    });
-    buttons.add_attribute_value("actions", builder.end());
-    widgets.push_back(buttons);
-
-    reply->push(widgets);
-}
-
-// class UninstalledPreview
-
-UninstalledPreview::UninstalledPreview(const unity::scopes::Result& result,
-                                       const unity::scopes::ActionMetadata& metadata,
-                                       const QSharedPointer<click::web::Client>& client,
-                                       const std::shared_ptr<click::DepartmentsDb>& depts,
-                                       const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager)
-    : PreviewStrategy(result, client),
-      DepartmentUpdater(depts),
-      metadata(metadata),
-      dm(new DownloadManager(client, manager))
-{
-    qDebug() << "Creating new UninstalledPreview for result" << QString::fromStdString(result["name"].get_string());
-}
-
-UninstalledPreview::~UninstalledPreview()
-{
-}
-
-void UninstalledPreview::run(unity::scopes::PreviewReplyProxy const& reply)
-{
-    const bool force_cache = (metadata.internet_connectivity() == scopes::QueryMetadata::ConnectivityStatus::Disconnected);
-    qDebug() << "preview, force_cache=" << force_cache << ", conn status=" << (int)metadata.internet_connectivity();
-
-    qDebug() << "in UninstalledPreview::run, about to populate details";
-    populateDetails([this, reply](const PackageDetails &details){
-            store_department(details);
-            found_details = details;
-        },
-        [this, reply](const ReviewList& reviewlist,
-                      click::Reviews::Error reviewserror) {
-            std::string app_name = result["name"].get_string();
-            dm->get_progress(app_name,
-                             [this, reply, reviewlist, reviewserror](std::string object_path){
-                found_object_path = object_path;
-                scopes::PreviewWidgetList button_widgets;
-                if(found_object_path.empty()) {
-                    button_widgets = uninstalledActionButtonWidgets(found_details);
-                } else {
-                    button_widgets = progressBarWidget(found_object_path);
-                }
-                qDebug() << "Pushed button action widgets.";
-                pushPackagePreviewWidgets(cachedWidgets, found_details, button_widgets);
-                qDebug() << "Pushed package details widgets.";
-                if (reviewserror == click::Reviews::Error::NoError) {
-                    qDebug() << "Pushing reviews widgets.";
-                    auto const revs = reviewsWidgets(reviewlist);
-                    cachedWidgets.push(revs);
-                    cachedWidgets.layout.appendToColumn(cachedWidgets.layout.singleColumn.column1, revs);
-                    cachedWidgets.layout.appendToColumn(cachedWidgets.layout.twoColumns.column1, revs);
-                } else {
-                    qDebug() << "There was an error getting reviews for:" << result["name"].get_string().c_str();
-                }
-                cachedWidgets.flush(reply);
-                reply->finished();
-                qDebug() << "---------- Finished reply for:" << result["name"].get_string().c_str();
-            });
-        }, force_cache);
-}
-
-scopes::PreviewWidgetList UninstalledPreview::uninstalledActionButtonWidgets(const PackageDetails &details)
-{
-    scopes::PreviewWidgetList widgets;
-    auto price = result["price"].get_double();
-
-    if (price == double(0.00)
-        || result["purchased"].get_bool() == false) {
-        scopes::PreviewWidget buttons("buttons", "actions");
-        scopes::VariantBuilder builder;
-        builder.add_tuple(
-            {
-                {"id", scopes::Variant(click::Preview::Actions::INSTALL_CLICK)},
-                {"label", scopes::Variant(_("Install"))},
-                {"download_url", scopes::Variant(details.download_url)},
-                {"download_sha512", scopes::Variant(details.download_sha512)},
-            });
-        buttons.add_attribute_value("actions", builder.end());
-        oa_client.register_account_login_item(buttons,
-                                              scopes::OnlineAccountClient::PostLoginAction::ContinueActivation,
-                                              scopes::OnlineAccountClient::PostLoginAction::DoNothing);
-        widgets.push_back(buttons);
-    }
-
-    return widgets;
-}
-
-// class UninstallingPreview : public UninstalledPreview
-
-// TODO: this class should be removed once uninstall() is handled elsewhere.
-UninstallingPreview::UninstallingPreview(const unity::scopes::Result& result,
-                                         const unity::scopes::ActionMetadata& metadata,
-                                         const QSharedPointer<click::web::Client>& client,
-                                         const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager)
-    : UninstalledPreview(result, metadata, client, nullptr, manager)
-{
-}
-
-UninstallingPreview::~UninstallingPreview()
-{
-}
-
-void UninstallingPreview::run(unity::scopes::PreviewReplyProxy const& reply)
-{
-    qDebug() << "in UninstallingPreview::run, calling uninstall";
-    uninstall();
-    qDebug() << "in UninstallingPreview::run, calling UninstalledPreview::run()";
-    UninstalledPreview::run(reply);
-}
-
-void UninstallingPreview::uninstall()
-{
-    click::Package package;
-    package.title = result.title();
-    package.name = result["name"].get_string();
-    package.version = result["version"].get_string();
-    qt::core::world::enter_with_task([this, package] ()
-    {
-        click::PackageManager manager;
-        manager.uninstall(package, [&](int code, std::string stderr_content) {
-                if (code != 0) {
-                    qDebug() << "Error removing package:" << stderr_content.c_str();
-                } else {
-                    qDebug() << "successfully removed package";
-
-                }
-            } );
-    });
-}
-
-
 } // namespace click

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2016-10-24 21:26:23 +0000
+++ libclickscope/click/preview.h	2017-01-10 16:06:37 +0000
@@ -31,9 +31,7 @@
 #define CLICKPREVIEW_H
 
 #include <click/index.h>
-#include <click/download-manager.h>
 #include <click/qtbridge.h>
-#include "reviews.h"
 
 #include <click/network_access_manager.h>
 
@@ -105,14 +103,7 @@
     PreviewStrategy* build_strategy(const unity::scopes::Result& result,
                                     const unity::scopes::ActionMetadata& metadata,
                                     const QSharedPointer<web::Client> &client,
-                                    const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
                                     std::shared_ptr<click::DepartmentsDb> depts);
-    virtual PreviewStrategy* build_installing(const std::string& download_url,
-                                              const std::string& download_sha512,
-                                              const unity::scopes::Result& result,
-                                              const QSharedPointer<click::web::Client>& client,
-                                              const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
-                                              std::shared_ptr<click::DepartmentsDb> depts);
 public:
     UNITY_DEFINES_PTRS(Preview);
     struct Actions
@@ -145,7 +136,6 @@
             std::shared_future<void> const& qt_ready = std::future<void>());
     virtual ~Preview();
     void choose_strategy(const QSharedPointer<web::Client> &client,
-                         const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
                          std::shared_ptr<click::DepartmentsDb> depts);
     // From unity::scopes::PreviewQuery
     void cancelled() override;
@@ -168,20 +158,13 @@
                                            const scopes::PreviewWidgetList& button_area_widgets);
 
     virtual void run_under_qt(const std::function<void ()> &task);
-    virtual void invalidateScope(const std::string& scope_id);
 
 protected:
     virtual void populateDetails(std::function<void(const PackageDetails &)> details_callback,
-                                 std::function<void(const click::ReviewList&,
-                                                    click::Reviews::Error)> reviews_callback,
                                  bool force_cache = false);
     virtual scopes::PreviewWidgetList headerWidgets(const PackageDetails &details);
     virtual scopes::PreviewWidgetList screenshotsWidgets(const PackageDetails &details);
     virtual scopes::PreviewWidgetList descriptionWidgets(const PackageDetails &details);
-    virtual scopes::PreviewWidgetList progressBarWidget(const std::string& object_path);
-    virtual scopes::PreviewWidgetList reviewsWidgets(const click::ReviewList &reviewlist);
-    virtual scopes::PreviewWidgetList downloadErrorWidgets();
-    virtual scopes::PreviewWidgetList loginErrorWidgets(const std::string& download_url, const std::string& download_sha512);
     virtual scopes::PreviewWidgetList errorWidgets(const scopes::Variant& title,
                                                    const scopes::Variant& summary,
                                                    const scopes::Variant& action_id,
@@ -199,45 +182,7 @@
     QSharedPointer<click::web::Client> client;
     QSharedPointer<click::Index> index;
     click::web::Cancellable index_operation;
-    QSharedPointer<click::Reviews> reviews;
-    click::web::Cancellable reviews_operation;
-    click::web::Cancellable submit_operation;
     scopes::OnlineAccountClient oa_client;
-    click::web::Cancellable purchase_operation;
-};
-
-class DownloadErrorPreview : public PreviewStrategy
-{
-public:
-    DownloadErrorPreview(const unity::scopes::Result& result);
-
-    virtual ~DownloadErrorPreview();
-
-    void run(unity::scopes::PreviewReplyProxy const& reply) override;
-};
-
-class InstallingPreview : public PreviewStrategy, public DepartmentUpdater
-{
-public:
-    InstallingPreview(const unity::scopes::Result& result) : PreviewStrategy(result) {}
-    InstallingPreview(const std::string& download_url,
-                      const std::string& download_sha512,
-                      const unity::scopes::Result& result,
-                      const QSharedPointer<click::web::Client>& client,
-                      const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager,
-                      std::shared_ptr<click::DepartmentsDb> depts);
-
-    virtual ~InstallingPreview();
-
-    void run(unity::scopes::PreviewReplyProxy const& reply) override;
-
-protected:
-    std::string download_url;
-    std::string download_sha512;
-    QSharedPointer<click::DownloadManager> dm;
-    std::shared_ptr<click::DepartmentsDb> depts_db;
-    CachedPreviewWidgets cachedWidgets;
-    void startLauncherAnimation(const PackageDetails& details);
 };
 
 class InstalledPreview : public PreviewStrategy, public DepartmentUpdater
@@ -253,9 +198,7 @@
     void run(unity::scopes::PreviewReplyProxy const& reply) override;
 
     std::string getApplicationUri(const Manifest& manifest);
-    std::string get_consumer_key();
     scopes::PreviewWidgetList createButtons(const click::Manifest& manifest);
-    scopes::PreviewWidget createRatingWidget(const click::Review& review) const;
 
 private:
     scopes::ActionMetadata metadata;
@@ -270,71 +213,6 @@
     void run(unity::scopes::PreviewReplyProxy const& reply) override;
 };
 
-class PurchasingPreview : public PreviewStrategy
-{
-public:
-    PurchasingPreview(const unity::scopes::Result& result,
-                      const QSharedPointer<click::web::Client>& client);
-    virtual ~PurchasingPreview();
-
-    void run(unity::scopes::PreviewReplyProxy const& reply) override;
-
-protected:
-    virtual scopes::PreviewWidgetList purchasingWidgets(const PackageDetails &);
-};
-
-class UninstallConfirmationPreview : public PreviewStrategy
-{
-public:
-    UninstallConfirmationPreview(const unity::scopes::Result& result);
-
-    virtual ~UninstallConfirmationPreview();
-
-    void run(unity::scopes::PreviewReplyProxy const& reply) override;
-};
-
-class UninstalledPreview : public PreviewStrategy, public DepartmentUpdater
-{
-public:
-    UninstalledPreview(const unity::scopes::Result& result,
-                       const unity::scopes::ActionMetadata& metadata,
-                       const QSharedPointer<click::web::Client>& client,
-                       const std::shared_ptr<click::DepartmentsDb>& depts,
-                       const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager);
-
-    virtual ~UninstalledPreview();
-
-    void run(unity::scopes::PreviewReplyProxy const& reply) override;
-    virtual scopes::PreviewWidgetList uninstalledActionButtonWidgets(const PackageDetails &details);
-
-protected:
-    scopes::ActionMetadata metadata;
-    PackageDetails found_details;
-    CachedPreviewWidgets cachedWidgets;
-    std::string found_object_path;
-
-    QSharedPointer<click::DownloadManager> dm;
-};
-
-// TODO: this is only necessary to perform uninstall.
-// That should be moved to a separate action, and this class removed.
-class UninstallingPreview : public UninstalledPreview
-{
-public:
-    UninstallingPreview(const unity::scopes::Result& result,
-                        const unity::scopes::ActionMetadata& metadata,
-                        const QSharedPointer<click::web::Client>& client,
-                        const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager);
-
-    virtual ~UninstallingPreview();
-
-    void run(unity::scopes::PreviewReplyProxy const& reply) override;
-
-protected:
-    void uninstall();
-
-};
-
 } // namespace click
 
 #endif

=== removed file 'libclickscope/click/reviews.cpp'
--- libclickscope/click/reviews.cpp	2016-05-25 16:19:51 +0000
+++ libclickscope/click/reviews.cpp	1970-01-01 00:00:00 +0000
@@ -1,245 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#include <cstdlib>
-#include <algorithm>
-
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/foreach.hpp>
-
-#include <click/configuration.h>
-
-#include <json/value.h>
-#include <json/writer.h>
-
-#include "reviews.h"
-
-namespace click
-{
-
-bool operator== (const Review& lhs, const Review &rhs)
-{
-    return lhs.id == rhs.id &&
-        lhs.rating == rhs.rating &&
-        lhs.usefulness_favorable == rhs.usefulness_favorable &&
-        lhs.usefulness_total == rhs.usefulness_total &&
-        lhs.hide == rhs.hide &&
-        lhs.date_created == rhs.date_created &&
-        lhs.date_deleted == rhs.date_deleted &&
-        lhs.package_name == rhs.package_name &&
-        lhs.package_version == rhs.package_version &&
-        lhs.language == rhs.language &&
-        lhs.summary == rhs.summary &&
-        lhs.review_text == rhs.review_text &&
-        lhs.reviewer_name == rhs.reviewer_name &&
-        lhs.reviewer_username == rhs.reviewer_username;
-}
-
-ReviewList review_list_from_json (const std::string& json)
-{
-    std::istringstream stream(json);
-
-    boost::property_tree::ptree tree;
-    boost::property_tree::read_json(stream, tree);
-
-    ReviewList reviews;
-
-    BOOST_FOREACH(boost::property_tree::ptree::value_type &value, tree)
-    {
-        assert(value.first.empty()); // array elements have no names
-        auto node = value.second;
-        Review review;
-
-        review.id = node.get<uint32_t>("id");
-        review.rating = node.get<int>("rating");
-        review.usefulness_favorable = node.get<uint32_t>("usefulness_favorable");
-        review.usefulness_total = node.get<uint32_t>("usefulness_total");
-        review.hide = node.get<bool>("hide");
-        review.date_created = node.get<std::string>("date_created");
-        review.date_deleted = node.get<std::string>("date_deleted");
-        review.package_name = node.get<std::string>("package_name");
-        review.package_version = node.get<std::string>("version");
-        review.language = node.get<std::string>("language");
-        review.summary = node.get<std::string>("summary");
-        review.review_text = node.get<std::string>("review_text");
-        review.reviewer_username = node.get<std::string>("reviewer_username");
-        review.reviewer_name = node.get<std::string>("reviewer_displayname", review.reviewer_username);
-
-        reviews.push_back(review);
-    }
-    return reviews;
-}
-
-ReviewList bring_to_front (const ReviewList& reviews, const std::string& userid)
-{
-    if (userid.size() == 0)
-    {
-        return reviews;
-    }
-    auto new_reviews = reviews;
-    auto it = std::find_if(new_reviews.begin(), new_reviews.end(), [userid](const Review& review) {
-                return review.reviewer_username == userid;
-            });
-    if (it != new_reviews.end() && it != new_reviews.begin()) {
-        // move own review to the front
-        auto const review = *it;
-        new_reviews.erase(it);
-        new_reviews.push_front(review);
-    }
-    return new_reviews;
-}
-
-Reviews::Reviews (const QSharedPointer<click::web::Client>& client)
-    : client(client)
-{
-}
-
-Reviews::~Reviews ()
-{
-}
-
-click::web::Cancellable Reviews::fetch_reviews (const std::string& package_name,
-                                                std::function<void(ReviewList, Error)> callback,
-                                                bool force_cache)
-{
-    click::web::CallParams params;
-    params.add(click::REVIEWS_QUERY_ARGNAME, package_name.c_str());
-    QSharedPointer<click::web::Response> response = client->call
-        (get_base_url() + click::REVIEWS_API_PATH, "GET", false,
-         std::map<std::string, std::string>{}, "", params, force_cache);
-
-    QObject::connect(response.data(), &click::web::Response::finished,
-                [=](QString reply) {
-                    auto status = response->get_status_code();
-                    click::ReviewList reviews;
-                    if (status == 200) {
-                        reviews = review_list_from_json(reply.toUtf8().constData());
-                        callback(reviews, click::Reviews::Error::NoError);
-                    } else {
-                        callback(reviews, click::Reviews::Error::NetworkError);
-                    }
-                });
-    QObject::connect(response.data(), &click::web::Response::error,
-                [=](QString) {
-                    qDebug() << "Network error attempting to fetch reviews for:" << package_name.c_str();
-                    callback(ReviewList(), click::Reviews::Error::NetworkError);
-                });
-
-    return click::web::Cancellable(response);
-}
-
-click::web::Cancellable Reviews::submit_review (const Review& review,
-                                                std::function<void(Error)> callback)
-{
-    std::map<std::string, std::string> headers({
-            {click::web::CONTENT_TYPE_HEADER, click::web::CONTENT_TYPE_JSON},
-                });
-    Json::Value root(Json::ValueType::objectValue);
-    root["package_name"] = review.package_name;
-    root["version"] = review.package_version;
-    root["rating"] = review.rating;
-    root["review_text"] = review.review_text;
-
-    root["arch_tag"] = click::Configuration().get_architecture();
-    /* NOTE: We only use the base language code for reviews, except for
-     * codes in the click::Configuration::FULL_LANG_CODES vector.
-     */
-    auto language = click::Configuration().get_language();
-    if (click::Configuration::is_full_lang_code(language)) {
-        root["language"] = language;
-    } else {
-        root["language"] = click::Configuration().get_language_base();
-    }
-
-    // NOTE: "summary" is a required field, but we don't have one. Use "".
-    root["summary"] = "Review";
-    
-    qDebug() << "Rating" << review.package_name.c_str() << review.rating;
-
-    QSharedPointer<click::web::Response> response = client->call
-        (get_base_url() + click::REVIEWS_API_PATH, "POST", true,
-         headers, Json::FastWriter().write(root), click::web::CallParams());
-
-    QObject::connect(response.data(), &click::web::Response::finished,
-                [=](QString) {
-                   qDebug() << "Review submitted for:" << review.package_name.c_str();
-                   callback(Error::NoError);
-                });
-    QObject::connect(response.data(), &click::web::Response::error,
-                [=](QString) {
-                    qCritical() << "Network error submitting a reviews for:" << review.package_name.c_str();
-                    callback(Error::NetworkError);
-                });
-
-    return click::web::Cancellable(response);
-}
-
-click::web::Cancellable Reviews::edit_review (const Review& review,
-                                                std::function<void(Error)> callback)
-{
-    std::map<std::string, std::string> headers({
-            {click::web::CONTENT_TYPE_HEADER, click::web::CONTENT_TYPE_JSON},
-                });
-    Json::Value root(Json::ValueType::objectValue);
-    root["rating"] = review.rating;
-    root["review_text"] = review.review_text;
-    // NOTE: "summary" is a required field, but we don't have one. Use "".
-    root["summary"] = "Review";
-
-    qDebug() << "Rating" << review.package_name.c_str() << review.rating;
-
-    QSharedPointer<click::web::Response> response = client->call
-        (get_base_url() + click::REVIEWS_API_PATH + std::to_string(review.id) + "/", "PUT", true,
-         headers, Json::FastWriter().write(root), click::web::CallParams());
-
-    QObject::connect(response.data(), &click::web::Response::finished,
-                [=](QString) {
-                   qDebug() << "Review updated for:" << review.package_name.c_str();
-                   callback(Error::NoError);
-                });
-    QObject::connect(response.data(), &click::web::Response::error,
-                [=](QString) {
-                    qCritical() << "Network error updating a review for:" << review.package_name.c_str();
-                    callback(Error::NetworkError);
-                });
-
-    return click::web::Cancellable(response);
-}
-
-std::string Reviews::get_base_url ()
-{
-    const char *env_url = getenv(REVIEWS_BASE_URL_ENVVAR.c_str());
-    if (env_url != NULL) {
-        return env_url;
-    }
-    return click::REVIEWS_BASE_URL;
-}
-
-} //namespace click

=== removed file 'libclickscope/click/reviews.h'
--- libclickscope/click/reviews.h	2016-04-27 14:06:29 +0000
+++ libclickscope/click/reviews.h	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#ifndef CLICK_REVIEWS_H
-#define CLICK_REVIEWS_H
-
-#include <functional>
-#include <string>
-#include <list>
-
-#include <click/webclient.h>
-
-namespace click
-{
-
-const std::string REVIEWS_BASE_URL_ENVVAR = "U1_REVIEWS_BASE_URL";
-const std::string REVIEWS_BASE_URL = "https://reviews.ubuntu.com";
-const std::string REVIEWS_API_PATH = "/click/api/1.0/reviews/";
-const std::string REVIEWS_QUERY_ARGNAME = "package_name";
-
-struct Review
-{
-    uint32_t    id;
-    int         rating;
-    uint32_t    usefulness_favorable;
-    uint32_t    usefulness_total;
-    bool        hide;
-    std::string date_created;
-    std::string date_deleted;
-    std::string package_name;
-    std::string package_version;
-    std::string language;
-    std::string summary;
-    std::string review_text;
-    std::string reviewer_name;
-    std::string reviewer_username;
-};
-
-typedef std::list<Review> ReviewList;
-
-ReviewList review_list_from_json (const std::string& json);
-ReviewList bring_to_front (const ReviewList& reviews, const std::string& userid);
-
-class Reviews
-{
-protected:
-    QSharedPointer<web::Client> client;
-public:
-    enum class Error {NoError, CredentialsError, NetworkError};
-    Reviews() {}
-    Reviews(const QSharedPointer<click::web::Client>& client);
-    virtual ~Reviews();
-
-    virtual click::web::Cancellable fetch_reviews (const std::string& package_name,
-                                           std::function<void(ReviewList, Error)> callback,
-                                           bool force_cache = false);
-    click::web::Cancellable submit_review (const Review& review,
-                                           std::function<void(Error)> callback);
-    click::web::Cancellable edit_review (const Review& review,
-                                           std::function<void(Error)> callback);
-
-    static std::string get_base_url ();
-};
-
-bool operator==(const Review& lhs, const Review& rhs);
-
-} // namespace click
-
-#endif // CLICK_REVIEWS_H

=== modified file 'libclickscope/click/scope_activation.cpp'
--- libclickscope/click/scope_activation.cpp	2016-05-19 18:05:56 +0000
+++ libclickscope/click/scope_activation.cpp	2017-01-10 16:06:37 +0000
@@ -28,7 +28,6 @@
  */
 
 #include "scope_activation.h"
-#include <click/download-manager.h>
 #include <click/package.h>
 #include <click/interface.h>
 #include <click/qtbridge.h>
@@ -55,42 +54,3 @@
 {
     hints_[key] = value;
 }
-
-click::PerformUninstallAction::PerformUninstallAction(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata)
-    : unity::scopes::ActivationQueryBase(result, metadata)
-{
-}
-
-unity::scopes::ActivationResponse click::PerformUninstallAction::activate()
-{
-    std::promise<bool> uninstall_success_p;
-    std::future<bool> uninstall_success_f = uninstall_success_p.get_future();
-
-    auto const res = result();
-    click::Package package;
-    package.title = res.title();
-    package.name = res["name"].get_string();
-    package.version = res["version"].get_string();
-    qt::core::world::enter_with_task([this, package, &uninstall_success_p] ()
-    {
-        click::PackageManager manager;
-        manager.uninstall(package, [&](int code, std::string stderr_content) {
-                if (code != 0) {
-                    qDebug() << "Error removing package:" << stderr_content.c_str();
-                    uninstall_success_p.set_value(false);
-                } else {
-                    qDebug() << "successfully removed package";
-                    uninstall_success_p.set_value(true);
-                }
-            } );
-    });
-
-    if (uninstall_success_f.get())
-    {
-        if (res.contains("lonely_result") && res.value("lonely_result").get_bool())
-        {
-            return unity::scopes::ActivationResponse(unity::scopes::CannedQuery(APPS_SCOPE_ID.toUtf8().data()));
-        }
-    }
-    return unity::scopes::ActivationResponse(unity::scopes::ActivationResponse::ShowDash);
-}

=== modified file 'libclickscope/click/scope_activation.h'
--- libclickscope/click/scope_activation.h	2016-05-18 12:38:46 +0000
+++ libclickscope/click/scope_activation.h	2017-01-10 16:06:37 +0000
@@ -37,13 +37,6 @@
 namespace click
 {
 
-class PerformUninstallAction: public unity::scopes::ActivationQueryBase
-{
-public:
-    PerformUninstallAction(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata);
-    unity::scopes::ActivationResponse activate() override;
-};
-
 class ScopeActivation : public unity::scopes::ActivationQueryBase
 {
     unity::scopes::ActivationResponse activate() override;

=== modified file 'libclickscope/tests/CMakeLists.txt'
--- libclickscope/tests/CMakeLists.txt	2016-10-24 21:26:23 +0000
+++ libclickscope/tests/CMakeLists.txt	2017-01-10 16:06:37 +0000
@@ -20,7 +20,6 @@
 add_executable (${LIBCLICKSCOPE_TESTS_TARGET}
   mock_network_access_manager.h
   mock_ual.h
-  mock_ubuntu_download_manager.h
   mock_ubuntuone_credentials.h
   mock_webclient.h
   fake_json.cpp
@@ -28,12 +27,10 @@
   test_configuration.cpp
   test_departments.cpp
   test_departments-db.cpp
-  test_download_manager.cpp
   test_index.cpp
   test_interface.cpp
   test_package.cpp
   test_preview.cpp
-  test_reviews.cpp
   test_smartconnect.cpp
   test_utils.cpp
   test_webclient.cpp
@@ -46,8 +43,6 @@
 
   ${UNITY_SCOPES_LDFLAGS}
   ${UBUNTUONE_LDFLAGS}
-  ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
-  ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
   ${JSON_CPP_LDFLAGS}
 
   gmock

=== removed file 'libclickscope/tests/mock_ubuntu_download_manager.h'
--- libclickscope/tests/mock_ubuntu_download_manager.h	2016-02-24 17:48:56 +0000
+++ libclickscope/tests/mock_ubuntu_download_manager.h	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2014-2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#ifndef _MOCK_UBUNTU_DOWNLOAD_MANAGER_H_
-#define _MOCK_UBUNTU_DOWNLOAD_MANAGER_H_
-
-#include <QDBusConnection>
-#include <QDBusObjectPath>
-
-#include <ubuntu/download_manager/download.h>
-#include <ubuntu/download_manager/downloads_list.h>
-#include <ubuntu/download_manager/error.h>
-#include <ubuntu/download_manager/manager.h>
-
-#include <gmock/gmock.h>
-
-class MockDownload : public Ubuntu::DownloadManager::Download
-{
-public:
-    MockDownload() : Ubuntu::DownloadManager::Download(){};
-    MockDownload(Ubuntu::DownloadManager::Error *err) : Ubuntu::DownloadManager::Download(err) {};
-    // mock ALL methods so that we do not have an abstract class
-
-    MOCK_METHOD0(start, void());
-    MOCK_METHOD0(pause, void());
-    MOCK_METHOD0(resume, void());
-    MOCK_METHOD0(cancel, void());
-
-    MOCK_METHOD1(allowMobileDownload, void(bool));
-    MOCK_METHOD0(isMobileDownloadAllowed, bool());
-
-    MOCK_METHOD1(setThrottle, void(qulonglong));
-    MOCK_METHOD0(throttle, qulonglong());
-
-    MOCK_CONST_METHOD0(id, QString());
-
-    MOCK_METHOD1(setDestinationDir, void(const QString& path));
-    MOCK_METHOD0(metadata, QVariantMap());
-    MOCK_METHOD1(setMetadata, void(QVariantMap));
-    MOCK_METHOD0(progress, qulonglong());
-    MOCK_METHOD0(totalSize, qulonglong());
-
-    MOCK_CONST_METHOD0(clickPackage, QString());
-    MOCK_CONST_METHOD0(title, QString());
-    MOCK_CONST_METHOD0(showInIndicator, bool());
-
-    MOCK_CONST_METHOD0(isError, bool());
-    MOCK_CONST_METHOD0(error, Error*());
-    MOCK_METHOD0(headers, QMap<QString, QString>());
-    MOCK_METHOD1(setHeaders, void(QMap<QString, QString>));
-    MOCK_CONST_METHOD0(destinationApp, QString());
-
-    MOCK_METHOD0(collected, void());
-    MOCK_METHOD0(filePath, QString());
-    MOCK_METHOD0(state, Download::State());
-};
-
-class MockError : public Ubuntu::DownloadManager::Error
-{
-public:
-
-    MockError() : Ubuntu::DownloadManager::Error(Ubuntu::DownloadManager::Error::Type::Process, 0) {};
-    MOCK_METHOD0(errorString, QString());
-};
-
-class MockDownloadsList : public Ubuntu::DownloadManager::DownloadsList
-{
-public:
-
- MockDownloadsList() : Ubuntu::DownloadManager::DownloadsList() {};
-
-    MOCK_CONST_METHOD0(downloads, QList<QSharedPointer<Ubuntu::DownloadManager::Download>>());
-    MOCK_CONST_METHOD0(isError, bool());
-    MOCK_CONST_METHOD0(error, Ubuntu::DownloadManager::Error*());
-};
-
-class MockSystemDownloadManager : public Ubuntu::DownloadManager::Manager
-{
-public:
-
-    MockSystemDownloadManager() : Ubuntu::DownloadManager::Manager() {};
-
-    MOCK_METHOD1(getDownloadForId, Download*(const QString&));
-    MOCK_METHOD1(createDownload,
-                 void(DownloadStruct downStruct));
-    MOCK_METHOD3(createDownload,
-                 void(DownloadStruct downStruct, DownloadCb cb, DownloadCb errCb));
-    MOCK_METHOD5(createDownload,
-                 void(StructList downs, const QString &algorithm, bool allowed3G, const QVariantMap &metadata, StringMap headers));
-    MOCK_METHOD7(createDownload,
-                 void(StructList downs, const QString &algorithm, bool allowed3G, const QVariantMap &metadata, StringMap headers, GroupCb cb, GroupCb errCb));
-
-    MOCK_METHOD2(getAllDownloads, void(const QString &appId, bool uncompleted));
-    MOCK_METHOD4(getAllDownloads, void(const QString &appId,
-                 bool uncompleted,
-                 DownloadsListCb cb,
-                 DownloadsListCb errCb));
-    MOCK_METHOD2(getAllDownloadsWithMetadata, void(const QString &name,
-                 const QString &value));
-
-    MOCK_METHOD4(getAllDownloadsWithMetadata, void(const QString &name,
-                 const QString &value, MetadataDownloadsListCb cb,
-                 MetadataDownloadsListCb errCb));
-
-    MOCK_CONST_METHOD0(isError, bool());
-    MOCK_CONST_METHOD0(lastError, Error*());
-    MOCK_METHOD1(allowMobileDataDownload, void(bool));
-    MOCK_METHOD0(isMobileDataDownload, bool());
-    MOCK_METHOD0(defaultThrottle, qulonglong());
-    MOCK_METHOD1(setDefaultThrottle, void(qulonglong));
-    MOCK_METHOD0(exit, void());
-};
-
-#endif /* _MOCK_UBUNTU_DOWNLOAD_MANAGER_H_ */

=== modified file 'libclickscope/tests/test_bootstrap.cpp'
--- libclickscope/tests/test_bootstrap.cpp	2016-06-30 20:42:56 +0000
+++ libclickscope/tests/test_bootstrap.cpp	2017-01-10 16:06:37 +0000
@@ -27,7 +27,6 @@
  * files in the program, then also delete it here.
  */
 #include <click/configuration.h>
-#include <click/reviews.h>
 #include <click/webclient.h>
 #include <click/index.h>
 

=== removed file 'libclickscope/tests/test_download_manager.cpp'
--- libclickscope/tests/test_download_manager.cpp	2016-05-10 13:42:12 +0000
+++ libclickscope/tests/test_download_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,220 +0,0 @@
-/*
- * Copyright (C) 2014-2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#include <click/download-manager.h>
-#include <tests/mock_network_access_manager.h>
-#include <tests/mock_webclient.h>
-#include <tests/mock_ubuntu_download_manager.h>
-#include <tests/mock_ubuntuone_credentials.h>
-
-#include <gtest/gtest.h>
-#include <memory>
-
-using namespace ::testing;
-
-namespace udm = Ubuntu::DownloadManager;
-#include <ubuntu/download_manager/download_struct.h>
-
-namespace
-{
-const QString TEST_URL("http://test.local/");
-const QString TEST_SHA512("fake_hash");
-const QString TEST_HEADER_VALUE("test header value");
-const QString TEST_APP_ID("test_app_id");
-const QString TEST_CLICK_TOKEN_VALUE("test token value");
-const QString TEST_DOWNLOAD_ID("/com/ubuntu/download_manager/test");
-const QString TEST_DOWNLOADERROR_STRING("test downloadError string");
-
-
-class DownloadManagerTest : public ::testing::Test
-{
-protected:
-    QSharedPointer<MockClient> clientPtr;
-    QSharedPointer<MockNetworkAccessManager> namPtr;
-    QSharedPointer<MockSystemDownloadManager> sdmPtr;
-    QSharedPointer<MockCredentialsService> ssoPtr;
-    std::shared_ptr<click::DownloadManager> dmPtr;
-
-    virtual void SetUp()
-    {
-        ssoPtr.reset(new MockCredentialsService());
-        namPtr.reset(new MockNetworkAccessManager());
-        clientPtr.reset(new NiceMock<MockClient>(namPtr));
-        clientPtr->setCredentialsService(ssoPtr);
-        dmPtr.reset(new click::DownloadManager(clientPtr, sdmPtr));
-    }
-
-    MOCK_METHOD2(start_callback, void(std::string, click::DownloadManager::Error));
-    MOCK_METHOD1(progress_callback, void(std::string));
-};
-
-}
-
-TEST_F(DownloadManagerTest, testStartCallsWebservice)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    dmPtr->start("", "", "",
-                 [](std::string, click::DownloadManager::Error) {});
-}
-
-TEST_F(DownloadManagerTest, testStartCallbackCalled)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(0)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(""));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(*this, start_callback(_, _)).Times(1);
-
-    dmPtr->start("", "", "",
-                 [this](std::string msg, click::DownloadManager::Error err) {
-                     start_callback(msg, err);
-                 });
-    response->replyFinished();
-}
-
-TEST_F(DownloadManagerTest, testStartHTTPForbidden)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(403)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(""));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(*this, start_callback(StartsWith("Unhandled HTTP response code:"),
-                                      click::DownloadManager::Error::DownloadInstallError)).Times(1);
-
-    dmPtr->start("", "", "",
-                 [this](std::string msg, click::DownloadManager::Error err) {
-                     start_callback(msg, err);
-                 });
-    response->replyFinished();
-}
-
-TEST_F(DownloadManagerTest, testStartHTTPError)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, errorString())
-        .WillOnce(Return(QString("ERROR")));
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(404)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(""));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(*this, start_callback("ERROR (203)",
-                                      click::DownloadManager::Error::DownloadInstallError)).Times(1);
-
-    dmPtr->start("", "", "",
-                 [this](std::string msg, click::DownloadManager::Error err) {
-                     start_callback(msg, err);
-                 });
-    response->errorHandler(QNetworkReply::ContentNotFoundError);
-}
-
-TEST_F(DownloadManagerTest, testStartCredentialsError)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, errorString())
-        .WillOnce(Return(QString("ERROR")));
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(401)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(""));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(*ssoPtr, invalidateCredentials());
-    EXPECT_CALL(*this, start_callback("ERROR (201)",
-                                      click::DownloadManager::Error::CredentialsError)).Times(1);
-
-    dmPtr->start("", "", "test.package",
-                 [this](std::string msg, click::DownloadManager::Error err) {
-                     start_callback(msg, err);
-                 });
-    response->errorHandler(QNetworkReply::ContentAccessDenied);
-}
-
-// FIXME: createDownload() SEGV under tests
-TEST_F(DownloadManagerTest, DISABLED_testStartDownloadCreated)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, rawHeader(QByteArray("X-Click-Token")))
-        .Times(1)
-        .WillOnce(Return(QString("clicktoken")));
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(""));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    EXPECT_CALL(*sdmPtr, createDownload(_, _, _));
-    dmPtr->start("", "", "test.package",
-                 [this](std::string msg, click::DownloadManager::Error err) {
-                     start_callback(msg, err);
-                 });
-    response->replyFinished();
-}
-
-// FIXME: getAllDownloadsWithMetadata() SEGV under tests
-TEST_F(DownloadManagerTest, DISABLED_testGetProgressNoDownloads)
-{
-    EXPECT_CALL(*sdmPtr, getAllDownloadsWithMetadata(_, _, _, _))
-        .Times(1)
-        .WillOnce(InvokeArgument<3>(QStringLiteral(""), QStringLiteral(""),
-                                    nullptr));
-    dmPtr->get_progress("com.example.test",
-                        [this](std::string object_path) {
-                            progress_callback(object_path);
-                        });
-}

=== modified file 'libclickscope/tests/test_index.cpp'
--- libclickscope/tests/test_index.cpp	2016-12-02 18:37:59 +0000
+++ libclickscope/tests/test_index.cpp	2017-01-10 16:06:37 +0000
@@ -613,18 +613,6 @@
     EXPECT_EQ(1u, lists.second.size());
 }
 
-TEST_F(MockPackageManager, testUninstallCommandCorrect)
-{
-    click::Package package = {
-        "org.example.testapp", "Test App", 0.00,
-        "/tmp/foo.png",
-        "uri", "0.1.5", "app"
-    };
-    std::string expected = "pkcon -p remove org.example.testapp;0.1.5;all;local:click";
-    EXPECT_CALL(*this, execute_uninstall_command(expected, _)).Times(1);
-    uninstall(package, [](int, std::string) {});
-}
-
 class ExhibitionistIndex : public click::Index {
 public:
     using click::Index::build_index_query;

=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2016-12-02 18:37:59 +0000
+++ libclickscope/tests/test_interface.cpp	2017-01-10 16:06:37 +0000
@@ -114,7 +114,6 @@
 public:
     FakeClickInterface() {}
 
-    MOCK_CONST_METHOD1(get_manifest_json, std::string(const std::string&));
     MOCK_CONST_METHOD0(installed_apps, std::list<std::shared_ptr<ual::Application>>());
 };
 
@@ -485,79 +484,6 @@
               Interface::add_theme_scheme("/usr/share/unity8/graphics/applicationIcons/[e-mail]"));
 }
 
-TEST(ClickInterface, testManifestFromJsonOneApp)
-{
-    Manifest m = manifest_from_json(FAKE_JSON_MANIFEST_ONE_APP);
-    ASSERT_EQ(m.first_app_name, "fake-app");
-    ASSERT_TRUE(m.has_any_apps());
-    ASSERT_FALSE(m.has_any_scopes());
-}
-
-TEST(ClickInterface, testManifestFromJsonOneScope)
-{
-    Manifest m = manifest_from_json(FAKE_JSON_MANIFEST_ONE_SCOPE);
-    ASSERT_EQ(m.first_scope_id, "com.example.fake-scope_fake-scope-hook");
-    ASSERT_FALSE(m.has_any_apps());
-    ASSERT_TRUE(m.has_any_scopes());
-}
-
-TEST(ClickInterface, testManifestFromJsonOneAppOneScope)
-{
-    Manifest m = manifest_from_json(FAKE_JSON_MANIFEST_ONE_APP_ONE_SCOPE);
-    ASSERT_EQ(m.first_app_name, "fake-app");
-    ASSERT_EQ(m.first_scope_id, "com.example.fake-1app-1scope_fake-scope-hook");
-    ASSERT_TRUE(m.has_any_apps());
-    ASSERT_TRUE(m.has_any_scopes());
-}
-
-TEST(ClickInterface, testManifestFromJsonTwoAppsTwoScopes)
-{
-    Manifest m = manifest_from_json(FAKE_JSON_MANIFEST_TWO_APPS_TWO_SCOPES);
-    ASSERT_EQ(m.first_app_name, "fake-app1");
-    ASSERT_EQ(m.first_scope_id, "com.example.fake-2apps-2scopes_fake-scope-hook1");
-    ASSERT_TRUE(m.has_any_apps());
-    ASSERT_TRUE(m.has_any_scopes());
-}
-
-TEST_F(ClickInterfaceTest, testGetManifestForAppParseError)
-{
-    FakeClickInterface iface;
-    EXPECT_CALL(iface, get_manifest_json(_)).
-        Times(1).
-        WillOnce(Return("INVALID JSON"));
-    EXPECT_CALL(*this, manifest_callback(_, InterfaceError::ParseError));
-    iface.get_manifest_for_app(FAKE_PACKAGENAME, [this](Manifest manifest,
-                                                        InterfaceError error){
-                                   manifest_callback(manifest, error);
-                               });
-}
-
-TEST_F(ClickInterfaceTest, testGetManifestForAppIsRemovable)
-{
-    FakeClickInterface iface;
-    EXPECT_CALL(iface, get_manifest_json(_)).
-        Times(1).
-        WillOnce(Return(FAKE_JSON_MANIFEST_REMOVABLE));
-    iface.get_manifest_for_app(FAKE_PACKAGENAME, [](Manifest manifest,
-                                                    InterfaceError error){
-                                   ASSERT_TRUE(error == InterfaceError::NoError);
-                                   ASSERT_TRUE(manifest.removable);
-                               });
-}
-
-TEST_F(ClickInterfaceTest, testGetManifestForAppIsNotRemovable)
-{
-    FakeClickInterface iface;
-    EXPECT_CALL(iface, get_manifest_json(_)).
-        Times(1).
-        WillOnce(Return(FAKE_JSON_MANIFEST_NONREMOVABLE));
-    iface.get_manifest_for_app(FAKE_PACKAGENAME, [](Manifest manifest,
-                                                    InterfaceError error){
-                                   ASSERT_TRUE(error == InterfaceError::NoError);
-                                   ASSERT_FALSE(manifest.removable);
-                               });
-}
-
 TEST_F(ClickInterfaceTest, testGetInstalledPackagesParsed)
 {
     FakeClickInterface iface;

=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp	2016-12-02 18:37:59 +0000
+++ libclickscope/tests/test_preview.cpp	2017-01-10 16:06:37 +0000
@@ -31,9 +31,7 @@
 
 #include <click/index.h>
 #include <click/interface.h>
-#include <click/reviews.h>
 #include <fake_json.h>
-#include <mock_ubuntu_download_manager.h>
 
 #include <QCoreApplication>
 #include <QTimer>
@@ -70,26 +68,12 @@
 
 };
 
-class FakeReviews : public click::Reviews
-{
-public:
-    FakeReviews() {
-
-    }
-
-    click::web::Cancellable fetch_reviews(const std::string &/*package_name*/, std::function<void (click::ReviewList, Error)> callback, bool) override {
-        callback(click::ReviewList(), Error::NoError);
-        return click::web::Cancellable();
-    }
-};
-
 class FakePreview : public click::PreviewStrategy
 {
 public:
     FakePreview(Result& result) : click::PreviewStrategy::PreviewStrategy(result)
     {
         index.reset(new FakeIndex());
-        reviews.reset(new FakeReviews());
     }
 
     void run(const PreviewReplyProxy &/*reply*/)
@@ -155,8 +139,6 @@
     FakePreview preview{result};
     preview.populateDetails(
                 [](const click::PackageDetails &){
-                },
-                [](const click::ReviewList&, click::Reviews::Error){
                 });
 
 }
@@ -342,150 +324,6 @@
     ASSERT_EQ(expected_order, preview.call_order);
 }
 
-class StrategyChooserTest : public Test {
-protected:
-    unity::scopes::testing::Result result;
-    unity::scopes::ActionMetadata metadata;
-    unity::scopes::VariantMap metadict;
-    QSharedPointer<click::web::Client> client;
-    QSharedPointer<MockSystemDownloadManager> dm;
-    std::shared_ptr<click::DepartmentsDb> depts;
-    const std::string FAKE_SHA512 = "FAKE_SHA512";
-
-public:
-    StrategyChooserTest() : metadata("en_EN", "phone") {
-    }
-};
-
-class MockablePreview : public click::Preview {
-public:
-    MockablePreview(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata) :
-        click::Preview(result, metadata)
-    {
-
-    }
-
-    MOCK_METHOD6(build_installing,
-                 click::PreviewStrategy*(const std::string&,
-                                         const std::string&,
-                                         const unity::scopes::Result&,
-                                         const QSharedPointer<click::web::Client>&,
-                                         const QSharedPointer<Ubuntu::DownloadManager::Manager>&,
-                                         std::shared_ptr<click::DepartmentsDb>));
-};
-
-TEST_F(StrategyChooserTest, testSha512IsUsed) {
-    metadict["action_id"] = click::Preview::Actions::INSTALL_CLICK;
-    metadict["download_url"] = "fake_download_url";
-    metadict["download_sha512"] = FAKE_SHA512;
-    metadata.set_scope_data(unity::scopes::Variant(metadict));
-    MockablePreview preview(result, metadata);
-    EXPECT_CALL(preview, build_installing(_, FAKE_SHA512, _, _, _, _));
-    preview.choose_strategy(client, dm, depts);
-}
-
-
-class UninstalledPreviewTest : public PreviewsBaseTest {
-public:
-    FakeResult result{vm};
-    click::PackageDetails details;
-    unity::scopes::PreviewWidgetList widgets;
-    QSharedPointer<click::web::Client> client;
-    QSharedPointer<MockSystemDownloadManager> sdm;
-    std::shared_ptr<click::DepartmentsDb> depts;
-    unity::scopes::testing::MockPreviewReply reply;
-    std::shared_ptr<unity::scopes::testing::MockPreviewReply> replyptr{&reply, [](unity::scopes::testing::MockPreviewReply*){}};
-};
-
-class FakeBaseUninstalledPreview : public click::UninstalledPreview {
-    std::string object_path;
-public:
-    FakeBaseUninstalledPreview(const std::string& object_path,
-                               const unity::scopes::Result& result,
-                               const unity::scopes::ActionMetadata& metadata,
-                               const QSharedPointer<click::web::Client>& client,
-                               const std::shared_ptr<click::DepartmentsDb>& depts,
-                               const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager)
-        : click::UninstalledPreview(result, metadata, client, depts, manager),
-          object_path(object_path)
-    {
-    }
-
-    void populateDetails(std::function<void (const click::PackageDetails &)> details_callback,
-                         std::function<void (const click::ReviewList &, click::Reviews::Error)> reviews_callback) {
-        click::PackageDetails details;
-        details_callback(details);
-        reviews_callback({}, click::Reviews::Error::NoError);
-    }
-};
-
-class FakeUninstalledPreview : public FakeBaseUninstalledPreview {
-public:
-    MOCK_METHOD1(uninstalledActionButtonWidgets, scopes::PreviewWidgetList (const click::PackageDetails &details));
-    MOCK_METHOD1(progressBarWidget, scopes::PreviewWidgetList(const std::string& object_path));
-    FakeUninstalledPreview(const std::string& object_path,
-                           const unity::scopes::Result& result,
-                           const unity::scopes::ActionMetadata& metadata,
-                           const QSharedPointer<click::web::Client>& client,
-                           const std::shared_ptr<click::DepartmentsDb>& depts,
-                           const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager)
-        : FakeBaseUninstalledPreview(object_path, result, metadata, client, depts, manager) {
-    }
-};
-
-
-// FIXME: Needs Qt main loop
-TEST_F(UninstalledPreviewTest, DISABLED_testDownloadInProgress) {
-    std::string fake_object_path = "/fake/object/path";
-
-    result["name"] = "fake_app_name";
-    scopes::PreviewWidgetList response;
-    unity::scopes::ActionMetadata metadata("en_EN", "desktop");
-    FakeUninstalledPreview preview(fake_object_path, result, metadata, client, depts, sdm);
-    EXPECT_CALL(preview, progressBarWidget(_))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(*replyptr, register_layout(_));
-    preview.run(replyptr);
-}
-
-// FIXME: Needs Qt main loop
-TEST_F(UninstalledPreviewTest, DISABLED_testNoDownloadProgress) {
-    std::string fake_object_path = "";
-
-    result["name"] = "fake_app_name";
-    scopes::PreviewWidgetList response;
-    unity::scopes::ActionMetadata metadata("en_EN", "desktop");
-    FakeUninstalledPreview preview(fake_object_path, result, metadata, client, depts, sdm);
-    EXPECT_CALL(preview, uninstalledActionButtonWidgets(_))
-            .Times(1)
-            .WillOnce(Return(response));
-    preview.run(replyptr);
-}
-
-class FakeUninstalledRefundablePreview : FakeBaseUninstalledPreview {
-public:
-    FakeUninstalledRefundablePreview(const unity::scopes::Result& result,
-                                     const unity::scopes::ActionMetadata& metadata,
-                                     const QSharedPointer<click::web::Client>& client,
-                                     const std::shared_ptr<click::DepartmentsDb>& depts,
-                                     const QSharedPointer<Ubuntu::DownloadManager::Manager>& manager)
-        : FakeBaseUninstalledPreview(std::string{""}, result, metadata, client, depts, manager){
-    }
-    using click::UninstalledPreview::uninstalledActionButtonWidgets;
-};
-
-unity::scopes::VariantArray get_actions_from_widgets(const unity::scopes::PreviewWidgetList& widgets, int widget_number) {
-    auto widget = *std::next(widgets.begin(), widget_number);
-    return widget.attribute_values()["actions"].get_array();
-}
-
-std::string get_action_from_widgets(const unity::scopes::PreviewWidgetList& widgets, int widget_number, int action_number) {
-    auto actions = get_actions_from_widgets(widgets, widget_number);
-    auto selected_action = actions.at(action_number).get_dict();
-    return selected_action["id"].get_string();
-}
-
 class InstalledPreviewTest : public Test {
 protected:
     unity::scopes::testing::Result result;
@@ -499,25 +337,6 @@
     }
 };
 
-TEST_F(InstalledPreviewTest, testReviewWidgetIsNew) {
-    click::InstalledPreview preview(result, metadata, client, depts);
-    click::Review existing_review;
-    existing_review.id = 0;
-    auto widget = preview.createRatingWidget(existing_review);
-    ASSERT_EQ(widget.widget_type(), "rating-input");
-}
-
-TEST_F(InstalledPreviewTest, testReviewWidgetIsEdit) {
-    click::InstalledPreview preview(result, metadata, client, depts);
-    click::Review existing_review;
-    existing_review.id = 123456789;
-    existing_review.rating = 2.625f;
-    existing_review.review_text = "Mediocre at best.";
-    existing_review.reviewer_name = "reviewbot";
-    auto widget = preview.createRatingWidget(existing_review);
-    ASSERT_EQ(widget.widget_type(), "rating-edit");
-}
-
 TEST_F(InstalledPreviewTest, testGetApplicationURIClick) {
     click::InstalledPreview preview(result, metadata, client, depts);
     click::Manifest manifest;

=== removed file 'libclickscope/tests/test_reviews.cpp'
--- libclickscope/tests/test_reviews.cpp	2016-12-02 18:37:59 +0000
+++ libclickscope/tests/test_reviews.cpp	1970-01-01 00:00:00 +0000
@@ -1,487 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#include <click/configuration.h>
-#include <click/reviews.h>
-#include <click/webclient.h>
-
-#include <tests/mock_network_access_manager.h>
-#include <tests/mock_ubuntuone_credentials.h>
-#include <tests/mock_webclient.h>
-
-#include "fake_json.h"
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <stdlib.h>
-
-using namespace ::testing;
-
-namespace
-{
-
-class ReviewsTest : public ::testing::Test {
-protected:
-    QSharedPointer<MockClient> clientPtr;
-    QSharedPointer<MockNetworkAccessManager> namPtr;
-    std::shared_ptr<click::Reviews> reviewsPtr;
-
-    virtual void SetUp() {
-        namPtr.reset(new MockNetworkAccessManager());
-        clientPtr.reset(new NiceMock<MockClient>(namPtr));
-        reviewsPtr.reset(new click::Reviews(clientPtr));
-    }
-
-public:
-    MOCK_METHOD2(reviews_callback, void(click::ReviewList, click::Reviews::Error));
-};
-}
-
-TEST_F(ReviewsTest, bringToFrontUserMatches)
-{
-    click::Review r1;
-    r1.id = 1;
-    r1.reviewer_username = "user1";
-
-    click::Review r2;
-    r2.id = 2;
-    r2.reviewer_username = "user2";
-
-    click::Review r3;
-    r3.id = 3;
-    r3.reviewer_username = "user3";
-
-    click::ReviewList reviews {r1, r2, r3};
-
-    auto newReviews = bring_to_front(reviews, "user2");
-    EXPECT_EQ(3u, newReviews.size());
-    auto it = newReviews.begin();
-    EXPECT_EQ(2u, (*it).id);
-    ++it;
-    EXPECT_EQ(1u, (*it).id);
-    ++it;
-    EXPECT_EQ(3u, (*it).id);
-}
-
-TEST_F(ReviewsTest, bringToFrontUserMatchesFirstElement)
-{
-    click::Review r1;
-    r1.id = 1;
-    r1.reviewer_username = "user1";
-
-    click::Review r2;
-    r2.id = 2;
-    r2.reviewer_username = "user2";
-
-    click::ReviewList reviews {r1, r2};
-
-    auto newReviews = bring_to_front(reviews, "user1");
-    EXPECT_EQ(2u, newReviews.size());
-    auto it = newReviews.begin();
-    EXPECT_EQ(1u, (*it).id);
-    ++it;
-    EXPECT_EQ(2u, (*it).id);
-}
-
-TEST_F(ReviewsTest, bringToFrontEmptyList)
-{
-    click::ReviewList reviews;
-
-    auto newReviews = bring_to_front(reviews, "user1");
-    EXPECT_EQ(0u, newReviews.size());
-}
-
-TEST_F(ReviewsTest, bringToFrontUserDoesntMatch)
-{
-    click::Review r1;
-    r1.id = 1;
-    r1.reviewer_username = "user1";
-
-    click::Review r2;
-    r2.id = 2;
-    r2.reviewer_username = "user2";
-
-    click::ReviewList reviews {r1, r2};
-
-    auto newReviews = bring_to_front(reviews, "user0");
-    EXPECT_EQ(2u, newReviews.size());
-    auto it = newReviews.begin();
-    EXPECT_EQ(1u, (*it).id);
-    ++it;
-    EXPECT_EQ(2u, (*it).id);
-}
-
-TEST_F(ReviewsTest, testFetchReviewsCallsWebservice)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    reviewsPtr->fetch_reviews("", [](click::ReviewList,
-                                     click::Reviews::Error) {});
-}
-
-TEST_F(ReviewsTest, testFetchReviewsDoesNotSignCall)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(*clientPtr, callImpl(_, _, false, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    reviewsPtr->fetch_reviews("", [](click::ReviewList,
-                                     click::Reviews::Error) {});
-}
-
-TEST_F(ReviewsTest, testFetchReviewsSendsQueryAsParam)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    click::web::CallParams params;
-    params.add(click::REVIEWS_QUERY_ARGNAME, FAKE_PACKAGENAME);
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, params))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    reviewsPtr->fetch_reviews(FAKE_PACKAGENAME, [](click::ReviewList,
-                                                   click::Reviews::Error) {});
-}
-
-TEST_F(ReviewsTest, testFetchReviewsSendsCorrectPath)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::REVIEWS_API_PATH),
-                                     _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    reviewsPtr->fetch_reviews(FAKE_PACKAGENAME, [](click::ReviewList,
-                                                   click::Reviews::Error) {});
-}
-
-TEST_F(ReviewsTest, testFetchReviewsCallbackCalled)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    QByteArray fake_json("[]");
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(fake_json));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(*this, reviews_callback(_, _)).Times(1);
-
-    reviewsPtr->fetch_reviews("", [this](click::ReviewList reviews,
-                                         click::Reviews::Error error){
-                                  reviews_callback(reviews, error);
-                              });
-    response->replyFinished();
-}
-
-TEST_F(ReviewsTest, testFetchReviewsNot200)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(301)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(FAKE_JSON_REVIEWS_RESULT_ONE.c_str()));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    click::ReviewList empty_reviews_list;
-    EXPECT_CALL(*this, reviews_callback(empty_reviews_list, _)).Times(1);
-
-    reviewsPtr->fetch_reviews("", [this](click::ReviewList reviews,
-                                         click::Reviews::Error error){
-                                  reviews_callback(reviews, error);
-                              });
-    response->replyFinished();
-}
-
-TEST_F(ReviewsTest, testFetchReviewsEmptyJsonIsParsed)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    QByteArray fake_json("[]");
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(fake_json));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    click::ReviewList empty_reviews_list;
-    EXPECT_CALL(*this, reviews_callback(empty_reviews_list, _)).Times(1);
-
-    reviewsPtr->fetch_reviews("", [this](click::ReviewList reviews,
-                                         click::Reviews::Error error){
-                                  reviews_callback(reviews, error);
-                              });
-    response->replyFinished();
-}
-
-TEST_F(ReviewsTest, testFetchReviewsSingleJsonIsParsed)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    QByteArray fake_json(FAKE_JSON_REVIEWS_RESULT_ONE.c_str());
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(fake_json));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    click::ReviewList single_review_list =
-    {
-        click::Review
-        {
-            1, 4, 0, 0, false,
-            "2014-01-28T09:09:47.218Z", "null",
-            FAKE_PACKAGENAME, "0.2",
-            "en",
-            "Review Summary", "It is ok.",
-            "Reviewer", "reviewer"
-        }
-    };
-    EXPECT_CALL(*this, reviews_callback(single_review_list, _)).Times(1);
-
-    reviewsPtr->fetch_reviews("", [this](click::ReviewList reviews,
-                                         click::Reviews::Error error){
-                                  reviews_callback(reviews, error);
-                              });
-    response->replyFinished();
-}
-
-TEST_F(ReviewsTest, testFetchReviewsNetworkErrorReported)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(reply.instance, errorString())
-        .Times(1)
-        .WillOnce(Return("fake error"));
-    reviewsPtr->fetch_reviews("", [this](click::ReviewList reviews,
-                                         click::Reviews::Error error){
-                                  reviews_callback(reviews, error);
-                              });
-    click::ReviewList empty_reviews_list;
-    EXPECT_CALL(*this, reviews_callback(empty_reviews_list,
-                                        click::Reviews::Error::NetworkError))
-        .Times(1);
-
-    emit reply.instance.error(QNetworkReply::UnknownNetworkError);
-}
-
-TEST_F(ReviewsTest, testFetchReviewsIsCancellable)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    auto fetch_reviews_op = reviewsPtr->fetch_reviews("", [](click::ReviewList,
-                                                             click::Reviews::Error) {});
-    EXPECT_CALL(reply.instance, abort()).Times(1);
-    fetch_reviews_op.cancel();
-}
-
-TEST_F(ReviewsTest, testSubmitReviewIsCancellable)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    click::Review review;
-    review.rating = 3;
-    review.review_text = "A review";
-    review.package_name = "com.example.test";
-    review.package_version = "0.1";
-
-    EXPECT_CALL(*clientPtr, callImpl(_, "POST", true, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    auto submit_op = reviewsPtr->submit_review(review,
-                                               [](click::Reviews::Error){});
-    EXPECT_CALL(reply.instance, abort()).Times(1);
-    submit_op.cancel();
-}
-
-TEST_F(ReviewsTest, testSubmitReviewUtf8)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    click::Review review;
-    review.rating = 3;
-    review.review_text = "'\"小海嚴選";
-    review.package_name = "com.example.test";
-    review.package_version = "0.1";
-
-    // NOTE: gmock replaces the \" above as \\\" for HasSubstr(), so we have
-    // to manually copy the string into the expected result.
-    std::string expected_review_text = "\"review_text\":\"'\\\"小海嚴選\"";
-
-    EXPECT_CALL(*clientPtr, callImpl(_, "POST", true, _,
-                                     HasSubstr(expected_review_text), _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    auto submit_op = reviewsPtr->submit_review(review,
-                                               [](click::Reviews::Error){});
-}
-
-TEST_F(ReviewsTest, testSubmitReviewLanguageCorrect)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    click::Review review;
-    review.rating = 3;
-    review.review_text = "A review.";
-    review.package_name = "com.example.test";
-    review.package_version = "0.1";
-
-    ASSERT_EQ(setenv(click::Configuration::LANGUAGE_ENVVAR,
-                     "es_AR.UTF-8", 1), 0);
-    std::string expected_language = "\"language\":\"es\"";
-    EXPECT_CALL(*clientPtr, callImpl(_, "POST", true, _,
-                                     HasSubstr(expected_language), _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    auto submit_op = reviewsPtr->submit_review(review,
-                                               [](click::Reviews::Error){});
-    ASSERT_EQ(unsetenv(click::Configuration::LANGUAGE_ENVVAR), 0);
-}
-
-TEST_F(ReviewsTest, testSubmitReviewLanguageCorrectForFullLangCodes)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    click::Review review;
-    review.rating = 3;
-    review.review_text = "A review.";
-    review.package_name = "com.example.test";
-    review.package_version = "0.1";
-
-    for (std::string lang: click::Configuration::FULL_LANG_CODES) {
-        ASSERT_EQ(setenv(click::Configuration::LANGUAGE_ENVVAR,
-                         lang.c_str(), 1), 0);
-        std::string expected_language = "\"language\":\"" + lang + "\"";
-        EXPECT_CALL(*clientPtr, callImpl(_, "POST", true, _,
-                                         HasSubstr(expected_language), _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-        auto submit_op = reviewsPtr->submit_review(review,
-                                                   [](click::Reviews::Error){});
-        ASSERT_EQ(unsetenv(click::Configuration::LANGUAGE_ENVVAR), 0);
-    }
-}
-
-TEST_F(ReviewsTest, testEditReviewUrlHasReviewId)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    click::Review review;
-    review.id = 1234;
-    review.rating = 4;
-    review.review_text = "A review";
-    review.package_name = "com.example.test";
-    review.package_version = "0.1";
-
-    EXPECT_CALL(*clientPtr, callImpl(HasSubstr("/1234/"), "PUT", true, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    auto submit_op = reviewsPtr->edit_review(review,
-                                               [](click::Reviews::Error){});
-}
-
-TEST_F(ReviewsTest, testEditReviewIsCancellable)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    click::Review review;
-    review.id = 1234;
-    review.rating = 4;
-    review.review_text = "A review";
-    review.package_name = "com.example.test";
-    review.package_version = "0.1";
-
-    EXPECT_CALL(*clientPtr, callImpl(_, "PUT", true, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    auto submit_op = reviewsPtr->edit_review(review,
-                                               [](click::Reviews::Error){});
-    EXPECT_CALL(reply.instance, abort()).Times(1);
-    submit_op.cancel();
-}
-
-
-TEST_F(ReviewsTest, testGetBaseUrl)
-{
-    const char *value = getenv(click::REVIEWS_BASE_URL_ENVVAR.c_str());
-    if (value != NULL) {
-        ASSERT_TRUE(unsetenv(click::REVIEWS_BASE_URL_ENVVAR.c_str()) == 0);
-    }
-    ASSERT_TRUE(click::Reviews::get_base_url() == click::REVIEWS_BASE_URL);
-    
-}
-
-TEST_F(ReviewsTest, testGetBaseUrlFromEnv)
-{
-    ASSERT_TRUE(setenv(click::REVIEWS_BASE_URL_ENVVAR.c_str(),
-                       FAKE_SERVER.c_str(), 1) == 0);
-    ASSERT_TRUE(click::Reviews::get_base_url() == FAKE_SERVER);
-    ASSERT_TRUE(unsetenv(click::REVIEWS_BASE_URL_ENVVAR.c_str()) == 0);
-}

=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2016-11-08 13:42:04 +0000
+++ scope/clickapps/apps-scope.cpp	2017-01-10 16:06:37 +0000
@@ -81,7 +81,6 @@
     static const int zero = 0;
     auto emptyCb = [this]()
     {
-        dm.reset(Ubuntu::DownloadManager::Manager::createSessionManager());
         qt_ready_for_search_p.set_value();
 
         sso.reset(new click::CredentialsService());
@@ -107,57 +106,19 @@
         const unity::scopes::ActionMetadata& metadata) {
     qDebug() << "Scope::preview() called.";
     auto preview = new click::Preview(result, metadata, qt_ready_for_preview_f.share());
-    preview->choose_strategy(client, dm, depts_db);
+    preview->choose_strategy(client, depts_db);
     return unity::scopes::PreviewQueryBase::UPtr{preview};
 }
 
 
 unity::scopes::ActivationQueryBase::UPtr click::Scope::perform_action(unity::scopes::Result const& result, unity::scopes::ActionMetadata const& metadata,
-        std::string const& widget_id, std::string const& action_id)
+        std::string const&, std::string const& action_id)
 {
-    if (action_id == click::Preview::Actions::CONFIRM_UNINSTALL) {
-        return scopes::ActivationQueryBase::UPtr(new PerformUninstallAction(result, metadata));
-    }
-
     auto activation = new ScopeActivation(result, metadata);
     qDebug() << "perform_action called with action_id" << QString().fromStdString(action_id);
 
-    if (action_id == click::Preview::Actions::UNINSTALL_CLICK) {
-        activation->setHint(click::Preview::Actions::UNINSTALL_CLICK, unity::scopes::Variant(true));
-        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
-    } else if (action_id == click::Preview::Actions::CANCEL_PURCHASE_INSTALLED) {
-        activation->setHint(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED, unity::scopes::Variant(true));
-        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
-    } else if (action_id == click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED) {
-        activation->setHint(click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED, unity::scopes::Variant(true));
-        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
-    } else if (action_id == click::Preview::Actions::SHOW_INSTALLED) {
+    if (action_id == click::Preview::Actions::SHOW_INSTALLED) {
         activation->setHint(click::Preview::Actions::SHOW_INSTALLED, unity::scopes::Variant(true));
-        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
-    } else if (action_id == click::Preview::Actions::SHOW_UNINSTALLED) {
-        activation->setHint(click::Preview::Actions::SHOW_UNINSTALLED, unity::scopes::Variant(true));
-        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
-    } else if (action_id == click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_UNINSTALLED) {
-        activation->setHint(click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_UNINSTALLED, unity::scopes::Variant(true));
-        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
-    } else if (action_id == click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_INSTALLED) {
-        activation->setHint(click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_INSTALLED, unity::scopes::Variant(true));
-        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
-    } else if (action_id == click::Preview::Actions::RATED) {
-        scopes::VariantMap rating_info = metadata.scope_data().get_dict();
-        // Cast to int because widget gives us double, which is wrong.
-        int rating = ((int)rating_info["rating"].get_double());
-        std::string review_text = rating_info["review"].get_string();
-
-        // We have to get the values and then set them as hints here, to be
-        // able to pass them on to the Preview, which actually makes the
-        // call to submit.
-        activation->setHint("rating", scopes::Variant(rating));
-        activation->setHint("review", scopes::Variant(review_text));
-        activation->setHint(click::Preview::Actions::RATED,
-                            scopes::Variant(true));
-        activation->setHint("widget_id", scopes::Variant(widget_id));
-        activation->setStatus(scopes::ActivationResponse::Status::ShowPreview);
     }
     return scopes::ActivationQueryBase::UPtr(activation);
 }

=== modified file 'scope/clickapps/apps-scope.h'
--- scope/clickapps/apps-scope.h	2016-10-24 21:26:23 +0000
+++ scope/clickapps/apps-scope.h	2017-01-10 16:06:37 +0000
@@ -34,7 +34,6 @@
 #include <click/network_access_manager.h>
 #include <click/webclient.h>
 
-#include <ubuntu/download_manager/manager.h>
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/ActivationQueryBase.h>
@@ -73,7 +72,6 @@
     QSharedPointer<click::network::AccessManager> nam;
     QSharedPointer<click::web::Client> client;
     QSharedPointer<click::Index> index;
-    QSharedPointer<Ubuntu::DownloadManager::Manager> dm;
     QSharedPointer<click::CredentialsService> sso;
     std::shared_ptr<click::DepartmentsDb> depts_db;
 

=== modified file 'scope/tests/test_apps_scope.cpp'
--- scope/tests/test_apps_scope.cpp	2015-11-24 18:23:23 +0000
+++ scope/tests/test_apps_scope.cpp	2017-01-10 16:06:37 +0000
@@ -53,32 +53,6 @@
     }
 };
 
-TEST_F(AppsScopeTest, DISABLED_testConfirmUninstall)
-{
-    result.set_title("foo");
-    result[click::apps::Query::ResultKeys::NAME] = "foo.name";
-    result[click::apps::Query::ResultKeys::VERSION] = "0.1";
-    auto activation = scope.perform_action(result, metadata, "widget",
-                                           click::Preview::Actions::CONFIRM_UNINSTALL);
-    auto response = activation->activate();
-}
-
-TEST_F(AppsScopeTest, testCancelPurchaseInstalled)
-{
-    auto activation = scope.perform_action(result, metadata, "button",
-                                           click::Preview::Actions::CANCEL_PURCHASE_INSTALLED);
-    auto response = activation->activate();
-    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::CANCEL_PURCHASE_INSTALLED].get_bool());
-}
-
-TEST_F(AppsScopeTest, testCancelPurchaseUninstalled)
-{
-    auto activation = scope.perform_action(result, metadata, "button",
-                                           click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED);
-    auto response = activation->activate();
-    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED].get_bool());
-}
-
 TEST_F(AppsScopeTest, testShowInstalled)
 {
     auto activation = scope.perform_action(result, metadata, "button",
@@ -86,43 +60,3 @@
     auto response = activation->activate();
     EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::SHOW_INSTALLED].get_bool());
 }
-
-TEST_F(AppsScopeTest, testShowUninstalled)
-{
-    auto activation = scope.perform_action(result, metadata, "button",
-                                           click::Preview::Actions::SHOW_UNINSTALLED);
-    auto response = activation->activate();
-    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::SHOW_UNINSTALLED].get_bool());
-}
-
-TEST_F(AppsScopeTest, testConfirmCancelPurchaseUninstalled)
-{
-    auto activation = scope.perform_action(result, metadata, "widget_id",
-                                           click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_UNINSTALLED);
-    auto response = activation->activate();
-    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_UNINSTALLED].get_bool());
-}
-
-TEST_F(AppsScopeTest, testConfirmCancelPurcahseInstalled)
-{
-    auto activation = scope.perform_action(result, metadata, "widget_id",
-                                           click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_INSTALLED);
-    auto response = activation->activate();
-    EXPECT_TRUE(response.scope_data().get_dict()[click::Preview::Actions::CONFIRM_CANCEL_PURCHASE_INSTALLED].get_bool());
-}
-
-TEST_F(AppsScopeTest, testRatingNew)
-{
-    auto activation = scope.perform_action(result, metadata, "rating",
-                                           click::Preview::Actions::RATED);
-    auto response = activation->activate();
-    EXPECT_EQ("rating", response.scope_data().get_dict()["widget_id"].get_string());
-}
-
-TEST_F(AppsScopeTest, testRatingEdit)
-{
-    auto activation = scope.perform_action(result, metadata, "93345",
-                                           click::Preview::Actions::RATED);
-    auto response = activation->activate();
-    EXPECT_EQ("93345", response.scope_data().get_dict()["widget_id"].get_string());
-}