Issue #3593 - Make isolate a fully internal member of the engine

test/BaseJsTest.cpp

 /*
 * This file is part of Adblock Plus <https://adblockplus.org/>,
 * Copyright (C) 2006-2016 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"
 #include "../src/JsEngineTransition.h"
 
 AdblockPlus::JsEnginePtr CreateJsEngine(const AdblockPlus::AppInfo& appInfo)
 {
   return AdblockPlus::JsEngine::New(appInfo);
 }
 
 void BaseJsTest::SetUp()
 {
   jsEngine = CreateJsEngine();
-  jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new ThrowingLogSystem));
-  jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new ThrowingFileSystem));
-  jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new ThrowingWebRequest));
+  jsEngine->SetLogSystem(std::make_shared<ThrowingLogSystem>());
+  jsEngine->SetFileSystem(std::make_shared<ThrowingFileSystem>());
+  jsEngine->SetWebRequest(std::make_shared<ThrowingWebRequest>());
 }
 
 void BaseJsTest::TearDown()
 {
   ToInternal(jsEngine)->WaitForQuietScheduler();
+  EXPECT_EQ(1, jsEngine.use_count());
   jsEngine.reset();
-  EXPECT_EQ(0, jsEngine.use_count());
 }