| Index: test/BaseJsTest.cpp | 
| diff --git a/test/BaseJsTest.cpp b/test/BaseJsTest.cpp | 
| index 8beea9cabcf0c819faab6e099610a0d903442454..35cdbcaa03a6df8151913d13b7908e484a9ee7c7 100644 | 
| --- a/test/BaseJsTest.cpp | 
| +++ b/test/BaseJsTest.cpp | 
| @@ -35,7 +35,7 @@ void DelayedTimer::ProcessImmediateTimers(DelayedTimer::SharedTasks& timerTasks) | 
| } | 
| } | 
|  | 
| -FilterEnginePtr CreateFilterEngine(LazyFileSystem& fileSystem, | 
| +FilterEngine& CreateFilterEngine(LazyFileSystem& fileSystem, | 
| Platform& platform, | 
| const FilterEngine::CreationParameters& creationParams) | 
| { | 
| @@ -44,18 +44,18 @@ FilterEnginePtr CreateFilterEngine(LazyFileSystem& fileSystem, | 
| { | 
| fileSystemTasks.emplace_back(task); | 
| }; | 
| -  FilterEnginePtr retValue; | 
| -  platform.CreateFilterEngineAsync(creationParams, [&retValue, &fileSystem](const FilterEnginePtr& filterEngine) | 
| +  bool isFilterEngineReady = false; | 
| +  platform.CreateFilterEngineAsync(creationParams, [&isFilterEngineReady, &fileSystem](const FilterEngine& filterEngine) | 
| { | 
| -    retValue = filterEngine; | 
| fileSystem.scheduler = LazyFileSystem::ExecuteImmediately; | 
| +    isFilterEngineReady = true; | 
| }); | 
| -  while (!retValue && !fileSystemTasks.empty()) | 
| +  while (!isFilterEngineReady && !fileSystemTasks.empty()) | 
| { | 
| (*fileSystemTasks.begin())(); | 
| fileSystemTasks.pop_front(); | 
| } | 
| -  return retValue; | 
| +  return platform.GetFilterEngine(); | 
| } | 
|  | 
| ThrowingPlatformCreationParameters::ThrowingPlatformCreationParameters() | 
|  |