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

test/JsEngine.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
@@ skipping 86 matching lines @@
 
   // Remove callback
   jsEngine->RemoveEventCallback("foobar");
   callbackCalled = false;
   jsEngine->Evaluate("_triggerEvent('foobar')");
   ASSERT_FALSE(callbackCalled);
 }
 
 TEST(NewJsEngineTest, CallbackGetSet)
 {
-  AdblockPlus::JsEnginePtr jsEngine(AdblockPlus::JsEngine::New());
+  auto jsEngine = AdblockPlus::JsEngine::New();
 
   ASSERT_TRUE(jsEngine->GetLogSystem());
   ASSERT_ANY_THROW(jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr()));
-  AdblockPlus::LogSystemPtr logSystem(new AdblockPlus::DefaultLogSystem());
+  auto logSystem(std::make_shared<AdblockPlus::DefaultLogSystem>());
   jsEngine->SetLogSystem(logSystem);
   ASSERT_EQ(logSystem, jsEngine->GetLogSystem());
 
   ASSERT_TRUE(jsEngine->GetFileSystem());
   ASSERT_ANY_THROW(jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr()));
-  AdblockPlus::FileSystemPtr fileSystem(new AdblockPlus::DefaultFileSystem());
+  auto fileSystem(std::make_shared<AdblockPlus::DefaultFileSystem>());
   jsEngine->SetFileSystem(fileSystem);
   ASSERT_EQ(fileSystem, jsEngine->GetFileSystem());
 
   ASSERT_TRUE(jsEngine->GetWebRequest());
   ASSERT_ANY_THROW(jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr()));
-  AdblockPlus::WebRequestPtr webRequest(new AdblockPlus::DefaultWebRequest());
+  auto webRequest(std::make_shared<AdblockPlus::DefaultWebRequest>());
   jsEngine->SetWebRequest(webRequest);
   ASSERT_EQ(webRequest, jsEngine->GetWebRequest());
+
+  ASSERT_EQ(1, jsEngine.use_count());
+  jsEngine.reset();
 }
 
 TEST(NewJsEngineTest, GlobalPropertyTest)
 {
-  AdblockPlus::JsEnginePtr jsEngine(AdblockPlus::JsEngine::New());
+  auto jsEngine = AdblockPlus::JsEngine::New();
   jsEngine->SetGlobalProperty("foo", jsEngine->NewValue("bar"));
-  AdblockPlus::JsValuePtr foo = jsEngine->Evaluate("foo");
-  ASSERT_TRUE(foo->IsString());
-  ASSERT_EQ(foo->AsString(), "bar");
+  /*
+   * Use a separate scope for JsValue variable to ensure its destruction
+   *   before we check the use count of the engine.
+   */
+  {
+    auto foo = jsEngine->Evaluate("foo");
+    ASSERT_TRUE(foo->IsString());
+    ASSERT_EQ(foo->AsString(), "bar");
+  }
+  ASSERT_EQ(1, jsEngine.use_count());
+  jsEngine.reset();
 }