Some refactoring of global JavaScript objects

src/GlobalJsObject.cpp

 #include <vector>
 #include <stdexcept>
 
 #include <AdblockPlus/JsEngine.h>
 #include <AdblockPlus/JsValue.h>
+#include "ConsoleJsObject.h"
+#include "FileSystemJsObject.h"
 #include "GlobalJsObject.h"
 #include "ConsoleJsObject.h"
 #include "WebRequestJsObject.h"
 #include "Thread.h"
 
 using namespace AdblockPlus;
 
 namespace
 {
   class TimeoutThread : public Thread
@@ skipping 12 matching lines @@
       delay = arguments[1]->AsInt();
       for (size_t i = 2; i < arguments.size(); i++)
         functionArguments.push_back(arguments[i]);
     }
 
     void Run()
     {
       Sleep(delay);
 
       function->Call(functionArguments);
-      delete this;
     }
 
   private:
-    typedef v8::Persistent<v8::Value> Value;
-    typedef std::vector<Value> Values;
-
     JsValuePtr function;
     int delay;
     JsValueList functionArguments;
   };
 
   v8::Handle<v8::Value> SetTimeoutCallback(const v8::Arguments& arguments)
   {
     TimeoutThread* timeoutThread;
     try
     {
@@ skipping 14 matching lines @@
     return v8::Undefined();
   }
 }
 
 v8::Handle<v8::ObjectTemplate> GlobalJsObject::Create(
   JsEngine& jsEngine)
 {
   const v8::Locker locker(v8::Isolate::GetCurrent());
   v8::HandleScope handleScope;
   const v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New();
-  const v8::Handle<v8::ObjectTemplate> console =
-    AdblockPlus::ConsoleJsObject::Create(jsEngine);
-  global->Set(v8::String::New("console"), console);
   const v8::Handle<v8::FunctionTemplate> setTimeoutFunction =
-    v8::FunctionTemplate::New(::SetTimeoutCallback,
+    v8::FunctionTemplate::New(SetTimeoutCallback,
                               v8::External::New(&jsEngine));
   global->Set(v8::String::New("setTimeout"), setTimeoutFunction);
-  const v8::Handle<v8::ObjectTemplate> request =
-    AdblockPlus::WebRequestJsObject::Create(jsEngine);
-  global->Set(v8::String::New("_webRequest"), request);
+  const v8::Handle<v8::ObjectTemplate> fileSystemObject =
+    FileSystemJsObject::Create(jsEngine);
+  global->Set(v8::String::New("_fileSystem"), fileSystemObject);
+  const v8::Handle<v8::ObjectTemplate> webRequestObject =
+    WebRequestJsObject::Create(jsEngine);
+  global->Set(v8::String::New("_webRequest"), webRequestObject);
+  const v8::Handle<v8::ObjectTemplate> consoleObject =
+    ConsoleJsObject::Create(jsEngine);
+  global->Set(v8::String::New("console"), consoleObject);
   return handleScope.Close(global);
 }