| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-2017 eyeo GmbH | 3  * Copyright (C) 2006-2017 eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 30     std::string prefsContents; | 30     std::string prefsContents; | 
| 31 | 31 | 
| 32     std::shared_ptr<std::istream> Read(const std::string& path) const | 32     std::shared_ptr<std::istream> Read(const std::string& path) const | 
| 33     { | 33     { | 
| 34       if (path == "prefs.json" && !prefsContents.empty()) | 34       if (path == "prefs.json" && !prefsContents.empty()) | 
| 35         return std::shared_ptr<std::istream>(new std::istringstream(prefsContent
     s)); | 35         return std::shared_ptr<std::istream>(new std::istringstream(prefsContent
     s)); | 
| 36 | 36 | 
| 37       return LazyFileSystem::Read(path); | 37       return LazyFileSystem::Read(path); | 
| 38     } | 38     } | 
| 39 | 39 | 
| 40     void Write(const std::string& path, std::shared_ptr<std::istream> content) | 40     void Write(const std::string& path, const std::shared_ptr<std::istream>& con
     tent) | 
| 41     { | 41     { | 
| 42       if (path == "prefs.json") | 42       if (path == "prefs.json") | 
| 43       { | 43       { | 
| 44         std::stringstream ss; | 44         std::stringstream ss; | 
| 45         ss << content->rdbuf(); | 45         ss << content->rdbuf(); | 
| 46         prefsContents = ss.str(); | 46         prefsContents = ss.str(); | 
| 47       } | 47       } | 
| 48       else | 48       else | 
| 49         LazyFileSystem::Write(path, content); | 49         LazyFileSystem::Write(path, content); | 
| 50     } | 50     } | 
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 197 | 197 | 
| 198   AdblockPlus::Sleep(100); | 198   AdblockPlus::Sleep(100); | 
| 199 | 199 | 
| 200   ASSERT_FALSE(fileSystem->prefsContents.empty()); | 200   ASSERT_FALSE(fileSystem->prefsContents.empty()); | 
| 201 | 201 | 
| 202   jsEngine.reset(); | 202   jsEngine.reset(); | 
| 203   Reset(preconfiguredPrefs); | 203   Reset(preconfiguredPrefs); | 
| 204 | 204 | 
| 205   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page")->IsBool()); | 205   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page")->IsBool()); | 
| 206   ASSERT_FALSE(filterEngine->GetPref("suppress_first_run_page")->AsBool()); | 206   ASSERT_FALSE(filterEngine->GetPref("suppress_first_run_page")->AsBool()); | 
| 207 } | 207 } | 
| OLD | NEW | 
|---|