Issue 5189 - use r-value references when objects should be transferred

test/UpdateCheck.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
  * MERCHANTABILITY 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 Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <functional>
 
 #include "BaseJsTest.h"
 
+using namespace AdblockPlus;
+
 namespace
 {
   typedef std::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr;
 
   void FindAndReplace(std::string& source, const std::string& find, const std::string& replace)
   {
     for (size_t pos = 0; (pos = source.find(find), pos) != std::string::npos; pos += replace.size())
       source.replace(pos, find.size(), replace);
   }
 
@@ skipping 35 matching lines @@
       updateCallbackCalled = false;
       Reset();
     }
 
     void Reset()
     {
       jsEngine = CreateJsEngine(appInfo);
       jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem));
       jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem));
       jsEngine->SetWebRequest(webRequestPtr);
-      jsEngine->SetEventCallback("updateAvailable",
-          std::bind(&UpdateCheckTest::EventCallback, this, std::placeholders::_1));
+      jsEngine->SetEventCallback("updateAvailable", [this](JsValueList&& params)
+      {
+        eventCallbackCalled = true;
+        eventCallbackParams = std::move(params);
+      });
 
       filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
     }
 
     void ForceUpdateCheck()
     {
       filterEngine->ForceUpdateCheck(
           std::bind(&UpdateCheckTest::UpdateCallback, this, std::placeholders::_1));
     }
 
-    void EventCallback(const AdblockPlus::JsValueList& params)
-    {
-      eventCallbackCalled = true;
-      eventCallbackParams = params;
-    }
-
     void UpdateCallback(const std::string& error)
     {
       updateCallbackCalled = true;
       updateError = error;
     }
   };
 }
 
 TEST_F(UpdateCheckTest, RequestFailure)
 {
@@ skipping 151 matching lines @@
 
   Reset();
   ForceUpdateCheck();
 
   AdblockPlus::Sleep(100);
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 }