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 708 matching lines @@
       documentUrls1));
 }
 
 TEST_F(FilterEngineWithFreshFolder, LangAndAASubscriptionsAreChosenOnFirstRun)
 {
   AppInfo appInfo;
   appInfo.locale = "zh";
   const std::string langSubscriptionUrl = "https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt";
   auto jsEngine = createJsEngine(appInfo);
   auto filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
-  auto subscriptions = filterEngine->GetListedSubscriptions();
+  const auto subscriptions = filterEngine->GetListedSubscriptions();
   ASSERT_EQ(2u, subscriptions.size());
   std::unique_ptr<Subscription> aaSubscription;
   std::unique_ptr<Subscription> langSubscription;
   if (subscriptions[0].IsAA())
   {
-    aaSubscription.reset(new Subscription(std::move(subscriptions[0])));

[sergei, 2017/04/24 14:12:36]

I would not expect that android code is never copying the objects, so moving
here is not necessary, just add a copy-ctr.

[hub, 2017/04/24 15:02:42]

Done.

-    langSubscription.reset(new Subscription(std::move(subscriptions[1])));
+    aaSubscription.reset(new Subscription(subscriptions[0]));
+    langSubscription.reset(new Subscription(subscriptions[1]));
   }
   else if (subscriptions[1].IsAA())
   {
-    aaSubscription.reset(new Subscription(std::move(subscriptions[1])));
-    langSubscription.reset(new Subscription(std::move(subscriptions[0])));
+    aaSubscription.reset(new Subscription(subscriptions[1]));
+    langSubscription.reset(new Subscription(subscriptions[0]));
   }
   ASSERT_NE(nullptr, aaSubscription);
   ASSERT_NE(nullptr, langSubscription);
   EXPECT_EQ(langSubscriptionUrl, langSubscription->GetProperty("url").AsString());
   EXPECT_TRUE(filterEngine->IsAAEnabled());
 }
 
 TEST_F(FilterEngineWithFreshFolder, DisableSubscriptionsAutoSelectOnFirstRun)
 {
   auto jsEngine = createJsEngine();
@@ skipping 336 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);
   }
 }