5 files changed, 9 insertions, 5 deletions
diff --git a/indexer/indexer_tests/data_source_test.cpp b/indexer/indexer_tests/data_source_test.cpp
index c5b64905da..6bf21c0024 100644
--- a/indexer/indexer_tests/data_source_test.cpp
+++ b/indexer/indexer_tests/data_source_test.cpp
@@ -2,6 +2,7 @@
 
 #include "indexer/data_header.hpp"
 #include "indexer/data_source.hpp"
+#include "indexer/feature_source.hpp"
 #include "indexer/mwm_set.hpp"
 
 #include "coding/file_name_utils.hpp"
@@ -28,7 +29,10 @@ namespace
 class DataSourceTest : public MwmSet::Observer
 {
 public:
-  DataSourceTest() { TEST(m_dataSource.AddObserver(*this), ()); }
+  DataSourceTest() : m_dataSource(make_unique<FeatureSourceFactory>())
+  {
+    TEST(m_dataSource.AddObserver(*this), ());
+  }
 
   ~DataSourceTest() override { TEST(m_dataSource.RemoveObserver(*this), ()); }
 
diff --git a/indexer/indexer_tests/features_vector_test.cpp b/indexer/indexer_tests/features_vector_test.cpp
index ed0fdb80e6..1599d939cb 100644
--- a/indexer/indexer_tests/features_vector_test.cpp
+++ b/indexer/indexer_tests/features_vector_test.cpp
@@ -50,7 +50,7 @@ UNIT_TEST(FeaturesVectorTest_ParseMetadata)
 
   LocalCountryFile localFile = LocalCountryFile::MakeForTesting(kCountryName);
 
-  DataSource dataSource;
+  DataSource dataSource(make_unique<FeatureSourceFactory>());
   auto result = dataSource.RegisterMap(localFile);
   TEST_EQUAL(result.second, MwmSet::RegResult::Success, ());
 
diff --git a/indexer/indexer_tests/index_builder_test.cpp b/indexer/indexer_tests/index_builder_test.cpp
index aa60d56f1a..1be95727a2 100644
--- a/indexer/indexer_tests/index_builder_test.cpp
+++ b/indexer/indexer_tests/index_builder_test.cpp
@@ -52,7 +52,7 @@ UNIT_TEST(BuildIndexTest)
 
   {
     // Check that index actually works.
-    DataSource dataSource;
+    DataSource dataSource(make_unique<FeatureSourceFactory>());
     UNUSED_VALUE(dataSource.Register(platform::LocalCountryFile::MakeForTesting("build_index_test")));
 
     // Make sure that index is actually parsed.
diff --git a/indexer/indexer_tests/rank_table_test.cpp b/indexer/indexer_tests/rank_table_test.cpp
index 54f9a78b62..2436eb514c 100644
--- a/indexer/indexer_tests/rank_table_test.cpp
+++ b/indexer/indexer_tests/rank_table_test.cpp
@@ -97,7 +97,7 @@ UNIT_TEST(RankTableBuilder_EndToEnd)
     search::RankTableBuilder::Create(ranks, wcont);
   }
 
-  DataSource dataSource;
+  DataSource dataSource(make_unique<FeatureSourceFactory>());
   auto regResult = dataSource.RegisterMap(localFile);
   TEST_EQUAL(regResult.second, MwmSet::RegResult::Success, ());
 
diff --git a/indexer/indexer_tests/scale_index_reading_tests.cpp b/indexer/indexer_tests/scale_index_reading_tests.cpp
index 4718f14445..0693f084ac 100644
--- a/indexer/indexer_tests/scale_index_reading_tests.cpp
+++ b/indexer/indexer_tests/scale_index_reading_tests.cpp
@@ -54,7 +54,7 @@ public:
                                       [&](uint32_t index) { indices.push_back(index); });
     }
 
-    DataSource::FeaturesLoaderGuard loader(m_dataSource, id);
+    DataSource::FeaturesLoaderGuard loader(m_dataSource, id, FeatureSourceFactory());
 
     Names names;
     for (auto const & index : indices)