From a93db184e1f86cc241c20da8f38406b4999e865d Mon Sep 17 00:00:00 2001
From: Yuri Gorshenin <y@maps.me>
Date: Tue, 14 Nov 2017 12:38:04 +0300
Subject: [PATCH] Review fixes.

---
 .../test_with_custom_mwms.hpp                  | 13 +------------
 .../test_with_custom_mwms.hpp                  | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/indexer/indexer_tests_support/test_with_custom_mwms.hpp b/indexer/indexer_tests_support/test_with_custom_mwms.hpp
index 2babdb12ad..9fbc81614b 100644
--- a/indexer/indexer_tests_support/test_with_custom_mwms.hpp
+++ b/indexer/indexer_tests_support/test_with_custom_mwms.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "indexer/indexer_tests_support/test_with_classificator.hpp"
-#include "indexer/indexer_tests_support/helpers.hpp"
 
 #include "generator/generator_tests_support/test_mwm_builder.hpp"
 
@@ -17,8 +16,8 @@
 #include "base/assert.hpp"
 
 #include <string>
-#include <vector>
 #include <utility>
+#include <vector>
 
 namespace indexer
 {
@@ -70,15 +69,6 @@ public:
     return BuildMwm(name, feature::DataHeader::country, std::forward<BuildFn>(fn));
   }
 
-  template <typename EditorFn>
-  void EditFeature(FeatureID const & id, EditorFn && fn)
-  {
-    Index::FeaturesLoaderGuard loader(m_index, id.m_mwmId);
-    FeatureType ft;
-    CHECK(loader.GetFeatureByIndex(id.m_index, ft), ());
-    indexer::tests_support::EditFeature(ft, forward<EditorFn>(fn));
-  }
-
 protected:
   static void Cleanup(platform::LocalCountryFile const & file);
 
@@ -89,4 +79,3 @@ protected:
 };
 }  // namespace tests_support
 }  // namespace indexer
-
diff --git a/search/search_tests_support/test_with_custom_mwms.hpp b/search/search_tests_support/test_with_custom_mwms.hpp
index b80e5516f1..a1a0a1c456 100644
--- a/search/search_tests_support/test_with_custom_mwms.hpp
+++ b/search/search_tests_support/test_with_custom_mwms.hpp
@@ -1,9 +1,18 @@
+#pragma once
+
+#include "indexer/indexer_tests_support/helpers.hpp"
 #include "indexer/indexer_tests_support/test_with_custom_mwms.hpp"
 
 #include "search/editor_delegate.hpp"
 
+#include "indexer/feature.hpp"
+#include "indexer/index.hpp"
+
+#include "base/assert.hpp"
 #include "base/stl_add.hpp"
 
+#include <utility>
+
 namespace search
 {
 namespace tests_support
@@ -17,6 +26,15 @@ public:
   }
 
   ~TestWithCustomMwms() override = default;
+
+  template <typename EditorFn>
+  void EditFeature(FeatureID const & id, EditorFn && fn)
+  {
+    Index::FeaturesLoaderGuard loader(m_index, id.m_mwmId);
+    FeatureType ft;
+    CHECK(loader.GetFeatureByIndex(id.m_index, ft), ());
+    indexer::tests_support::EditFeature(ft, std::forward<EditorFn>(fn));
+  }
 };
 }  // namespace tests_support
 }  // namespace search