Issue 768 - Switch from TR1 to C++11

test/Notification.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 "BaseJsTest.h"
 
 using namespace AdblockPlus;
 
 // This define enables NotificationMockWebRequestTest but to run it
 // one need to set INITIAL_DELAY to about 2000 msec in notification.js.
 //#define NotificationMockWebRequestTest_ENABLED
 
 namespace
 {
-  typedef std::tr1::shared_ptr<FilterEngine> FilterEnginePtr;
+  typedef std::shared_ptr<FilterEngine> FilterEnginePtr;
 
   class NotificationTest : public BaseJsTest
   {
   protected:
     FilterEnginePtr filterEngine;
     void SetUp()
     {
       BaseJsTest::SetUp();
       jsEngine->SetFileSystem(FileSystemPtr(new LazyFileSystem()));
       jsEngine->SetWebRequest(WebRequestPtr(new LazyWebRequest()));
       jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
       filterEngine.reset(new FilterEngine(jsEngine));
     }
 
     void AddNotification(const std::string& notification)
     {
       jsEngine->Evaluate("(function()"
       "{"
         "require('notification').Notification.addNotification(" + notification + ");"
       "})();");
     }
 
     NotificationPtr PeekNotification(const std::string& url = std::string())
     {
       NotificationPtr retValue;
-      filterEngine->SetShowNotificationCallback(std::tr1::bind(
+      filterEngine->SetShowNotificationCallback(std::bind(
         &NotificationTest::NotificationAvailableCallback,
-        std::tr1::placeholders::_1, std::tr1::ref(retValue)));
+        std::placeholders::_1, std::ref(retValue)));
       filterEngine->ShowNextNotification(url);
       filterEngine->RemoveShowNotificationCallback();
       return retValue;
     }
 
     static void NotificationAvailableCallback(const NotificationPtr& src, NotificationPtr& dst)
     {
       EXPECT_TRUE(src);
       dst = src;
     }
@@ skipping 26 matching lines @@
   class NotificationMockWebRequestTest : public BaseJsTest
   {
   protected:
     FilterEnginePtr filterEngine;
     bool isNotificationCallbackCalled;
     void SetUp()
     {
       BaseJsTest::SetUp();
       isNotificationCallbackCalled = false;
       jsEngine->SetFileSystem(
-        std::tr1::shared_ptr<LazyFileSystem>(new LazyFileSystem()));
+        std::shared_ptr<LazyFileSystem>(new LazyFileSystem()));
       const char* responseJsonText = "{"
         "\"notifications\": [{"
           "\"id\": \"some id\","
           "\"type\": \"information\","
           "\"message\": {"
              "\"en-US\": \"message\""
           "},"
           "\"title\": \"Title\""
         "}]"
         "}";
-      jsEngine->SetWebRequest(std::tr1::shared_ptr<MockWebRequest>(
+      jsEngine->SetWebRequest(std::shared_ptr<MockWebRequest>(
         new MockWebRequest(responseJsonText)));
       jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
       filterEngine.reset(new FilterEngine(jsEngine));
       filterEngine->SetShowNotificationCallback(
         std::bind(&NotificationMockWebRequestTest::OnNotification,
-        this, std::tr1::placeholders::_1));
+        this, std::placeholders::_1));
     }
 
     void OnNotification(const NotificationPtr& notification)
     {
       isNotificationCallbackCalled = true;
       ASSERT_TRUE(notification);
       EXPECT_EQ(NotificationType::NOTIFICATION_TYPE_INFORMATION, notification->GetType());
       EXPECT_EQ("Title", notification->GetTitle());
       EXPECT_EQ("message", notification->GetMessageString());
       notification->MarkAsShown();
@@ skipping 73 matching lines @@
 TEST_F(NotificationTest, Links)
 {
   AddNotification("{ id: 'id', links: ['link1', 'link2'] }");
   NotificationPtr notification = PeekNotification();
   ASSERT_TRUE(notification);
   std::vector<std::string> notificationLinks = notification->GetLinks();
   ASSERT_EQ(2, notificationLinks.size());
   EXPECT_EQ("link1", notificationLinks[0]);
   EXPECT_EQ("link2", notificationLinks[1]);
 }