Issue 1906 - Fix broken Android build

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
@@ skipping 19 matching lines @@
   class NotificationTest : public BaseJsTest
   {
   protected:
     FilterEnginePtr filterEngine;
     void SetUp() override
     {
       BaseJsTest::SetUp();
       jsEngine->SetFileSystem(FileSystemPtr(new LazyFileSystem()));
       jsEngine->SetWebRequest(WebRequestPtr(new LazyWebRequest()));
       jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
-      filterEngine = 
-          std::tr1::shared_ptr<FilterEngine>(new FilterEngine(jsEngine));

[René Jeschke, 2015/01/29 14:22:22]

std::tr1::make_shared<T>(...) is not available on the gcc-toolchain version used
by the Android build.

First I thought about just 'polyfilling' std::tr1::make_shared, but the guarding
#ifdefs would have needed a bit of research, so I just replaced all make_shared
calls with direct shared_ptr instantiations.

[Felix Dahlke, 2015/01/29 16:49:25]

We can actually go for the shorter:

filterEngine.reset(new FilterEngine(jsEngine));

Same below.

[René Jeschke, 2015/01/29 17:07:53]

Done.

+      filterEngine.reset(new FilterEngine(jsEngine));
     }
 
     void AddNotification(const std::string& notification)
     {
       jsEngine->Evaluate("(function()"
       "{"
         "require('notification').Notification.addNotification(" + notification + ");"
       "})();");
     }
   };
@@ skipping 23 matching lines @@
 
 #ifdef NotificationMockWebRequestTest_ENABLED
   class NotificationMockWebRequestTest : public BaseJsTest
   {
   protected:
     FilterEnginePtr filterEngine;
     void SetUp() override
     {
       BaseJsTest::SetUp();
       jsEngine->SetFileSystem(
-          std::tr1::shared_ptr<LazyFileSystem>(new LazyFileSystem()));

[Felix Dahlke, 2015/01/29 16:49:25]

Next line indent is generally 2 spaces, apparent at some places in this file.
Also below.

[René Jeschke, 2015/01/29 17:07:53]

Done.

+        std::tr1::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>(
-          new MockWebRequest(responseJsonText)));
+        new MockWebRequest(responseJsonText)));
       jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
-      filterEngine = 
-          std::tr1::shared_ptr<FilterEngine>(new FilterEngine(jsEngine));
+      filterEngine.reset(new FilterEngine(jsEngine));
     }
   };
 #endif
 }
 
 TEST_F(NotificationTest, NoNotifications)
 {
   NotificationPtr notification = filterEngine->GetNextNotificationToShow();
   EXPECT_EQ(NULL, notification.get());
 }
@@ skipping 53 matching lines @@
 TEST_F(NotificationTest, MarkAsShown)
 {
   AddNotification("{ id: 'id', type: 'question' }");
   NotificationPtr notification = filterEngine->GetNextNotificationToShow();
   EXPECT_TRUE(notification);
   notification = filterEngine->GetNextNotificationToShow();
   ASSERT_TRUE(notification);
   notification->MarkAsShown();
   EXPECT_EQ(NULL, filterEngine->GetNextNotificationToShow().get());
 }