Issue 6477 - separate done and error callbacks in IFileSystem::Read

test/Prefs.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 14 matching lines @@
 namespace
 {
   class TestFileSystem : public LazyFileSystem
   {
     IOBuffer& prefsContents;
   public:
     explicit TestFileSystem(IOBuffer& prefsContent)
       : prefsContents(prefsContent)
     {
     }
-    void Read(const std::string& fileName, const ReadCallback& callback) const override
+    void Read(const std::string& fileName, const ReadCallback& callback, const Callback& errorCallback) const override
     {
-      scheduler([this, fileName, callback]
+      scheduler([this, fileName, callback, errorCallback]
       {
         if (fileName == "prefs.json" && !prefsContents.empty())
         {
-          callback(IOBuffer(prefsContents.cbegin(), prefsContents.cend()), "");
+          callback(IOBuffer(prefsContents.cbegin(), prefsContents.cend()));
           return;
         }
-
-        LazyFileSystem::Read(fileName, callback);
+        LazyFileSystem::Read(fileName, callback, errorCallback);
       });
     }
 
     void Write(const std::string& fileName, const IOBuffer& content, const Callback& callback) override
     {
       scheduler([this, fileName, content, callback]
       {
         if (fileName == "prefs.json")
         {
           prefsContents = content;
@@ skipping 154 matching lines @@
   {
     ResetPlatform();
     AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
     preconfiguredPrefs.emplace("suppress_first_run_page", GetJsEngine().NewValue(true));
     auto& filterEngine = CreateFilterEngine(preconfiguredPrefs);
 
     ASSERT_TRUE(filterEngine.GetPref("suppress_first_run_page").IsBool());
     ASSERT_FALSE(filterEngine.GetPref("suppress_first_run_page").AsBool());
   }
 }