Some refactoring of global JavaScript objects

src/JsEngine.cpp

 #include <AdblockPlus.h>
 #include <sstream>
 
 #include "GlobalJsObject.h"
+#include "Utils.h"
 
 namespace
 {
   v8::Handle<v8::Context> CreateContext(
     v8::Isolate* isolate,
     AdblockPlus::JsEngine& jsEngine)
   {
     const v8::Locker locker(isolate);
     const v8::HandleScope handleScope;
     const v8::Handle<v8::ObjectTemplate> global =
@@ skipping 12 matching lines @@
     else
       return v8::Script::Compile(v8Source);
   }
 
   void CheckTryCatch(const v8::TryCatch& tryCatch)
   {
     if (tryCatch.HasCaught())
       throw AdblockPlus::JsError(tryCatch.Exception(), tryCatch.Message());
   }
 
-  std::string Slurp(std::istream& stream)
-  {
-    std::stringstream content;
-    content << stream.rdbuf();
-    return content.str();
-  }
-
   std::string ExceptionToString(const v8::Handle<v8::Value> exception,
       const v8::Handle<v8::Message> message)
   {
     std::stringstream error;
     error << *v8::String::Utf8Value(exception);
     if (!message.IsEmpty())
     {
       error << " at ";
       error << *v8::String::Utf8Value(message->GetScriptResourceName());
       error << ":";
       error << message->GetLineNumber();
     }
     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(FileReader* const fileReader,
+AdblockPlus::JsEngine::JsEngine(FileSystem* const fileSystem,
                                 WebRequest* const webRequest,
                                 ErrorCallback* const errorCallback)
-  : fileReader(*fileReader), webRequest(*webRequest),
+  : fileSystem(*fileSystem), webRequest(*webRequest),
     errorCallback(*errorCallback), isolate(v8::Isolate::GetCurrent()),
     context(CreateContext(isolate, *this))
 {
 }
 
 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);
   v8::Local<v8::Value> result = script->Run();
   CheckTryCatch(tryCatch);
   return JsValuePtr(new JsValue(*this, result));
 }
 
 void AdblockPlus::JsEngine::Load(const std::string& scriptPath)
 {
-  const std::auto_ptr<std::istream> file = fileReader.Read(scriptPath);
-  if (!*file)
+  const std::tr1::shared_ptr<std::istream> file = fileSystem.Read(scriptPath);
+  if (!file || !*file)
     throw std::runtime_error("Unable to load script " + scriptPath);
-  Evaluate(Slurp(*file));
+  Evaluate(Utils::Slurp(*file));
 }
 
 void AdblockPlus::JsEngine::Gc()
 {
   while (!v8::V8::IdleNotification());
 }
 
 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(const std::string& val)
 {
   const Context context(*this);
@@ skipping 32 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)
 {
 }