Issue 5450 - don't expose std::shared_ptr<FilterEngine>

test/Notification.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 "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::shared_ptr<FilterEngine> FilterEnginePtr;
-
   class NotificationTest : public BaseJsTest
   {
   protected:
-    FilterEnginePtr filterEngine;
     void SetUp()
     {
       LazyFileSystem* fileSystem;
       ThrowingPlatformCreationParameters platformParams;
       platformParams.timer.reset(new NoopTimer());
       platformParams.fileSystem.reset(fileSystem = new LazyFileSystem());
       platformParams.webRequest.reset(new NoopWebRequest());
       platform.reset(new Platform(std::move(platformParams)));
-      filterEngine = CreateFilterEngine(*fileSystem, *platform);
+      CreateFilterEngine(*fileSystem, *platform);
     }
 
     void AddNotification(const std::string& notification)
     {
       GetJsEngine().Evaluate("(function()"
       "{"
         "require('notification').Notification.addNotification(" + notification + ");"
       "})();");
     }
 
     std::unique_ptr<Notification> PeekNotification(const std::string& url = std::string())
     {
       std::unique_ptr<Notification> retValue;
-      filterEngine->SetShowNotificationCallback(
+      auto& filterEngine = platform->GetFilterEngine();
+      filterEngine.SetShowNotificationCallback(
         [&retValue](Notification&& notification) {
           retValue.reset(new Notification(std::move(notification)));
         });
-      filterEngine->ShowNextNotification(url);
-      filterEngine->RemoveShowNotificationCallback();
+      filterEngine.ShowNextNotification(url);
+      filterEngine.RemoveShowNotificationCallback();
       return retValue;
     }
   };
 
   class MockWebRequest : public IWebRequest
   {
   public:
     std::string responseText;
     explicit MockWebRequest(const std::string& notification)
       : responseText(notification)
@@ skipping 11 matching lines @@
       serverResponse.responseStatus = 200;
       serverResponse.responseText = responseText;
       getCallback(serverResponse);
     }
   };
 
 #ifdef NotificationMockWebRequestTest_ENABLED
   class NotificationMockWebRequestTest : public BaseJsTest
   {
   protected:
-    FilterEnginePtr filterEngine;
     bool isNotificationCallbackCalled;
     void SetUp()
     {
       BaseJsTest::SetUp();
       isNotificationCallbackCalled = false;
       jsEngine->SetFileSystem(
         std::shared_ptr<LazyFileSystem>(new LazyFileSystem()));
       const char* responseJsonText = "{"
         "\"notifications\": [{"
           "\"id\": \"some id\","
@@ skipping 92 matching lines @@
 TEST_F(NotificationTest, Links)
 {
   AddNotification("{ id: 'id', links: ['link1', 'link2'] }");
   auto notification = PeekNotification();
   ASSERT_TRUE(notification);
   std::vector<std::string> notificationLinks = notification->GetLinks();
   ASSERT_EQ(2u, notificationLinks.size());
   EXPECT_EQ("link1", notificationLinks[0]);
   EXPECT_EQ("link2", notificationLinks[1]);
 }