Issue 768 - Switch from TR1 to C++11

test/UpdateCheck.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 <AdblockPlus/tr1_functional.h>
+#include <functional>
 
 #include "BaseJsTest.h"
 
 namespace
 {
-  typedef std::tr1::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr;
+  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);
   }
 
   std::string previousRequestUrl;
   class TestWebRequest : public LazyWebRequest
   {
@@ skipping 33 matching lines @@
       Reset();
     }
 
     void Reset()
     {
       jsEngine = AdblockPlus::JsEngine::New(appInfo);
       jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem));
       jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem));
       jsEngine->SetWebRequest(webRequestPtr);
       jsEngine->SetEventCallback("updateAvailable",
-          std::tr1::bind(&UpdateCheckTest::EventCallback, this, std::tr1::placeholders::_1));
+          std::bind(&UpdateCheckTest::EventCallback, this, std::placeholders::_1));
 
       filterEngine.reset(new AdblockPlus::FilterEngine(jsEngine));
     }
 
     void ForceUpdateCheck()
     {
       filterEngine->ForceUpdateCheck(
-          std::tr1::bind(&UpdateCheckTest::UpdateCallback, this, std::tr1::placeholders::_1));
+          std::bind(&UpdateCheckTest::UpdateCallback, this, std::placeholders::_1));
     }
 
     void EventCallback(AdblockPlus::JsValueList& params)
     {
       eventCallbackCalled = true;
       eventCallbackParams = params;
     }
 
     void UpdateCallback(const std::string& error)
     {
@@ skipping 159 matching lines @@
 
   Reset();
   ForceUpdateCheck();
 
   AdblockPlus::Sleep(100);
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 }