Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: test/BaseJsTest.cpp

Issue 29498576: Issue 4832 - remove API allowing changing of LogSystem after Initialization of JsEngine (Closed) Base URL: https://github.com/adblockplus/libadblockplus.git
Patch Set: Created July 26, 2017, 2:43 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 15 matching lines...) Expand all
26 { 26 {
27 ii->callback(); 27 ii->callback();
28 ii = timerTasks->erase(ii); 28 ii = timerTasks->erase(ii);
29 } 29 }
30 else 30 else
31 ++ii; 31 ++ii;
32 } 32 }
33 } 33 }
34 34
35 JsEngineCreationParameters::JsEngineCreationParameters() 35 JsEngineCreationParameters::JsEngineCreationParameters()
36 : logSystem(std::make_shared<ThrowingLogSystem>()) 36 : logSystem(new ThrowingLogSystem())
37 , timer(new ThrowingTimer()) 37 , timer(new ThrowingTimer())
38 , webRequest(new ThrowingWebRequest()) 38 , webRequest(new ThrowingWebRequest())
39 , fileSystem(std::make_shared<ThrowingFileSystem>()) 39 , fileSystem(std::make_shared<ThrowingFileSystem>())
40 { 40 {
41 } 41 }
42 42
43 AdblockPlus::JsEnginePtr CreateJsEngine(JsEngineCreationParameters&& jsEngineCre ationParameters) 43 AdblockPlus::JsEnginePtr CreateJsEngine(JsEngineCreationParameters&& jsEngineCre ationParameters)
44 { 44 {
45 auto jsEngine = AdblockPlus::JsEngine::New(jsEngineCreationParameters.appInfo, 45 auto jsEngine = AdblockPlus::JsEngine::New(jsEngineCreationParameters.appInfo,
46 std::move(jsEngineCreationParameters.timer), 46 std::move(jsEngineCreationParameters.timer),
47 std::move(jsEngineCreationParameters.fileSystem), 47 std::move(jsEngineCreationParameters.fileSystem),
48 std::move(jsEngineCreationParameters.webRequest)); 48 std::move(jsEngineCreationParameters.webRequest),
49 jsEngine->SetLogSystem(std::move(jsEngineCreationParameters.logSystem)); 49 std::move(jsEngineCreationParameters.logSystem));
50 return jsEngine; 50 return jsEngine;
51 } 51 }
OLDNEW

Powered by Google App Engine
This is Rietveld