Issue 5034 - Part 2: Have NewCallback() return a plain JsValue

src/JsEngine.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 213 matching lines @@
   const JsContext context(shared_from_this());
   return JsValuePtr(new JsValue(shared_from_this(), v8::Boolean::New(val)));
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewObject()
 {
   const JsContext context(shared_from_this());
   return JsValuePtr(new JsValue(shared_from_this(), v8::Object::New()));
 }
 
-AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewCallback(
+AdblockPlus::JsValue AdblockPlus::JsEngine::NewCallback(
     const v8::InvocationCallback& callback)
 {
   const JsContext context(shared_from_this());
 
   // Note: we are leaking this weak pointer, no obvious way to destroy it when
   // it's no longer used
   std::weak_ptr<JsEngine>* data =
       new std::weak_ptr<JsEngine>(shared_from_this());
   v8::Local<v8::FunctionTemplate> templ = v8::FunctionTemplate::New(callback,
       v8::External::New(data));
-  return JsValuePtr(new JsValue(shared_from_this(), templ->GetFunction()));
+  return JsValue(shared_from_this(), templ->GetFunction());
 }
 
 AdblockPlus::JsEnginePtr AdblockPlus::JsEngine::FromArguments(const v8::Arguments& arguments)
 {
   const v8::Local<const v8::External> external =
       v8::Local<const v8::External>::Cast(arguments.Data());
   std::weak_ptr<JsEngine>* data =
       static_cast<std::weak_ptr<JsEngine>*>(external->Value());
   JsEnginePtr result = data->lock();
   if (!result)
@@ skipping 71 matching lines @@
 
 
 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name,
                                               const AdblockPlus::JsValue& value)
 {
   auto global = GetGlobalObject();
   if (global.IsUndefined() || global.IsNull())
     throw std::runtime_error("Global object cannot be null");
   global.SetProperty(name, value);
 }