Simplify context setup, set properties on the global object directly instead of using templates

src/JsEngine.cpp

 #include <AdblockPlus.h>
 #include <sstream>
 
 #include "GlobalJsObject.h"
 #include "Utils.h"
 
 namespace
 {
   v8::Handle<v8::Script> CompileScript(const std::string& source, const std::string& filename)
   {
@@ skipping 28 matching lines @@
     return error.str();
   }
 }
 
 AdblockPlus::JsError::JsError(const v8::Handle<v8::Value> exception,
     const v8::Handle<v8::Message> message)
   : std::runtime_error(ExceptionToString(exception, message))
 {
 }
 
-AdblockPlus::JsEngine::JsEngine(FileSystem* const fileSystem,
+AdblockPlus::JsEngine::JsEngine(const AppInfo& appInfo,
+                                FileSystem* const fileSystem,
                                 WebRequest* const webRequest,
                                 ErrorCallback* const errorCallback)
   : fileSystem(*fileSystem), webRequest(*webRequest),
     errorCallback(*errorCallback), isolate(v8::Isolate::GetCurrent())
 {
   const v8::Locker locker(isolate);
   const v8::HandleScope handleScope;
 
   context = v8::Context::New();
-  AdblockPlus::GlobalJsObject::Setup(*this,
+  AdblockPlus::GlobalJsObject::Setup(*this, appInfo,
       JsValuePtr(new JsValue(*this, context->Global())));
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::Evaluate(const std::string& source,
     const std::string& filename)
 {
   const Context context(*this);
   const v8::TryCatch tryCatch;
   const v8::Handle<v8::Script> script = CompileScript(source, filename);
   CheckTryCatch(tryCatch);
@@ skipping 63 matching lines @@
   for (int i = 0; i < arguments.Length(); i++)
     list.push_back(JsValuePtr(new JsValue(*this, arguments[i])));
   return list;
 }
 
 AdblockPlus::JsEngine::Context::Context(const JsEngine& jsEngine)
     : locker(jsEngine.isolate), handleScope(),
       contextScope(jsEngine.context)
 {
 }