Issue 5165 - Remove SubscriptionPtr

test/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus 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.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 921 matching lines @@
     }
     void testSubscriptionState(AAStatus aaStatus, int otherSubscriptionsNumber)
     {
       if (aaStatus == AAStatus::enabled)
         EXPECT_TRUE(filterEngine->IsAAEnabled());
       else
         EXPECT_FALSE(filterEngine->IsAAEnabled());
 
       std::unique_ptr<Subscription> aaSubscription;
       std::unique_ptr<Subscription> otherSubscription;
-      const auto subscriptions = filterEngine->GetListedSubscriptions();
-      for (const auto& subscription : subscriptions)
+      auto subscriptions = filterEngine->GetListedSubscriptions();
+      for (auto& subscription : subscriptions)
       {
         (subscription.IsAA() ? aaSubscription : otherSubscription) =
-          std::unique_ptr<Subscription>(new Subscription(subscription));
+          std::unique_ptr<Subscription>(new Subscription(std::move(subscription)));
       }
       if (otherSubscriptionsNumber == 1u)
       {
         if (isAASatusPresent(aaStatus))
         {
           EXPECT_EQ(2u, subscriptions.size());
           EXPECT_TRUE(aaSubscription);
           EXPECT_TRUE(otherSubscription);
         }
         else
@@ skipping 27 matching lines @@
     uint8_t otherSubscriptionsNumber = ::testing::get<1>(GetParam());
     init(parameter.initialAAStatus, otherSubscriptionsNumber);
 
     if (parameter.action == Action::enable)
       filterEngine->SetAAEnabled(true);
     else if (parameter.action == Action::disable)
       filterEngine->SetAAEnabled(false);
     else if (parameter.action == Action::remove)
     {
       std::unique_ptr<Subscription> aaSubscription;
-      for (const auto& subscription : filterEngine->GetListedSubscriptions())
+      for (auto& subscription : filterEngine->GetListedSubscriptions())
       {
         if (subscription.IsAA())
         {
-          aaSubscription.reset(new Subscription(subscription));
+          aaSubscription.reset(new Subscription(std::move(subscription)));
           break;
         }
       }
       ASSERT_TRUE(aaSubscription);
       aaSubscription->RemoveFromList();
     }
 
     testSubscriptionState(parameter.expectedAAStatus, otherSubscriptionsNumber);
   }
 }
@@ skipping 79 matching lines @@
     filterEngine->SetAllowedConnectionType(&testConnection);
     auto subscription = EnsureExampleSubscriptionAndForceUpdate("subB");
     EXPECT_EQ("synchronize_ok", subscription.GetProperty("downloadStatus").AsString());
     EXPECT_EQ(1u, subscription.GetProperty("filters").AsList().size());
     auto capturedConnectionTypes = this->capturedConnectionTypes.GetStrings();
     ASSERT_EQ(1u, capturedConnectionTypes.size());
     EXPECT_TRUE(capturedConnectionTypes[0].first);
     EXPECT_EQ(testConnection, capturedConnectionTypes[0].second);
   }
 }