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

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
@@ skipping 13 matching lines @@
 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);
   }
 
-  class UpdateCheckTest : public ::testing::Test
+  class UpdateCheckTest : public BaseJsTest
   {
   protected:
     AdblockPlus::AppInfo appInfo;
     AdblockPlus::ServerResponse webRequestResponse;
     DelayedWebRequest::SharedTasks webRequestTasks;
     DelayedTimer::SharedTasks timerTasks;
-    std::unique_ptr<Platform> platform;
     FilterEnginePtr filterEngine;
 
     bool eventCallbackCalled;
     AdblockPlus::JsValueList eventCallbackParams;
     bool updateCallbackCalled;
     std::string updateError;
 
     void SetUp()
     {
       eventCallbackCalled = false;
       updateCallbackCalled = false;
     }
 
     void CreateFilterEngine()
     {
       LazyFileSystem* fileSystem;
       ThrowingPlatformCreationParameters platformParams;
       platformParams.logSystem.reset(new LazyLogSystem());
       platformParams.timer = DelayedTimer::New(timerTasks);
       platformParams.fileSystem.reset(fileSystem = new LazyFileSystem());
       platformParams.webRequest = DelayedWebRequest::New(webRequestTasks);
       platform.reset(new Platform(std::move(platformParams)));
       platform->SetUpJsEngine(appInfo);
-      platform->GetJsEngine()->SetEventCallback("updateAvailable", [this](JsValueList&& params)
+      GetJsEngine().SetEventCallback("updateAvailable", [this](JsValueList&& params)
       {
         eventCallbackCalled = true;
         eventCallbackParams = std::move(params);
       });
 
       filterEngine = ::CreateFilterEngine(*fileSystem, *platform);
     }
 
     // Returns a URL or the empty string if there is no such request.
     std::string ProcessPendingUpdateWebRequest()
@@ skipping 38 matching lines @@
   CreateFilterEngine();
   ForceUpdateCheck();
 
   auto requestUrl = ProcessPendingUpdateWebRequest();
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 
   std::string expectedUrl(filterEngine->GetPref("update_url_release").AsString());
-  std::string platform = filterEngine->GetJsEngine()->Evaluate("require('info').platform").AsString();
-  std::string platformVersion = filterEngine->GetJsEngine()->Evaluate("require('info').platformVersion").AsString();
+  std::string platform = GetJsEngine().Evaluate("require('info').platform").AsString();
+  std::string platformVersion = GetJsEngine().Evaluate("require('info').platformVersion").AsString();
 
   FindAndReplace(expectedUrl, "%NAME%", appInfo.name);
   FindAndReplace(expectedUrl, "%TYPE%", "1");   // manual update
   expectedUrl += "&addonName=" + appInfo.name +
                  "&addonVersion=" + appInfo.version +
                  "&application=" + appInfo.application +
                  "&applicationVersion=" + appInfo.applicationVersion +
                  "&platform=" + platform +
                  "&platformVersion=" + platformVersion +
                  "&lastVersion=0&downloadCount=0";
@@ skipping 17 matching lines @@
 
   auto requestUrl = ProcessPendingUpdateWebRequest();
 
   ASSERT_TRUE(eventCallbackCalled);
   ASSERT_EQ(1u, eventCallbackParams.size());
   ASSERT_EQ("https://foo.bar/", eventCallbackParams[0].AsString());
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_TRUE(updateError.empty());
 
   std::string expectedUrl(filterEngine->GetPref("update_url_devbuild").AsString());
-  std::string platform = filterEngine->GetJsEngine()->Evaluate("require('info').platform").AsString();
-  std::string platformVersion = filterEngine->GetJsEngine()->Evaluate("require('info').platformVersion").AsString();
+  std::string platform = GetJsEngine().Evaluate("require('info').platform").AsString();
+  std::string platformVersion = GetJsEngine().Evaluate("require('info').platformVersion").AsString();
 
   FindAndReplace(expectedUrl, "%NAME%", appInfo.name);
   FindAndReplace(expectedUrl, "%TYPE%", "1");   // manual update
   expectedUrl += "&addonName=" + appInfo.name +
                  "&addonVersion=" + appInfo.version +
                  "&application=" + appInfo.application +
                  "&applicationVersion=" + appInfo.applicationVersion +
                  "&platform=" + platform +
                  "&platformVersion=" + platformVersion +
                  "&lastVersion=0&downloadCount=0";
@@ skipping 126 matching lines @@
 
   // ensure that the was the corresponding request
   EXPECT_FALSE(ProcessPendingUpdateWebRequest().empty());
 
   EXPECT_FALSE(eventCallbackCalled);
   EXPECT_EQ(1, timesCalled);
 
   // previous handler is not restored
   EXPECT_FALSE(eventCallbackCalled);
 }