| 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-2016 Eyeo GmbH |   3 * Copyright (C) 2006-2016 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 | 
|  11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the |  11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
|  12 * GNU General Public License for more details. |  12 * GNU General Public License for more details. | 
|  13 * |  13 * | 
|  14 * You should have received a copy of the GNU General Public License |  14 * You should have received a copy of the GNU General Public License | 
|  15 * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. |  15 * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 
|  16 */ |  16 */ | 
|  17  |  17  | 
|  18 #include "BaseJsTest.h" |  18 #include "BaseJsTest.h" | 
 |  19 #include "../src/JsEngineTransition.h" | 
|  19  |  20  | 
|  20 AdblockPlus::JsEnginePtr CreateJsEngine(const AdblockPlus::AppInfo& appInfo) |  21 AdblockPlus::JsEnginePtr CreateJsEngine(const AdblockPlus::AppInfo& appInfo) | 
|  21 { |  22 { | 
|  22   static AdblockPlus::ScopedV8IsolatePtr isolate = std::make_shared<AdblockPlus:
    :ScopedV8Isolate>(); |  23   static AdblockPlus::ScopedV8IsolatePtr isolate = std::make_shared<AdblockPlus:
    :ScopedV8Isolate>(); | 
|  23   return AdblockPlus::JsEngine::New(appInfo, isolate); |  24   return AdblockPlus::JsEngine::New(appInfo, isolate); | 
|  24 } |  25 } | 
|  25  |  26  | 
|  26 void BaseJsTest::SetUp() |  27 void BaseJsTest::SetUp() | 
|  27 { |  28 { | 
|  28   jsEngine = CreateJsEngine(); |  29   jsEngine = CreateJsEngine(); | 
|  29   jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new ThrowingLogSystem)); |  30   jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new ThrowingLogSystem)); | 
|  30   jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new ThrowingFileSystem)); |  31   jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new ThrowingFileSystem)); | 
|  31   jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new ThrowingWebRequest)); |  32   jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new ThrowingWebRequest)); | 
|  32 } |  33 } | 
|  33  |  34  | 
|  34 void BaseJsTest::TearDown() |  35 void BaseJsTest::TearDown() | 
|  35 { |  36 { | 
|  36   jsEngine->WaitForQuietScheduler(); |  37   ToInternal(jsEngine)->WaitForQuietScheduler(); | 
|  37 } |  38 } | 
| OLD | NEW |