1 files changed, 15 insertions, 14 deletions

diff --git a/search/search_tests_support/test_search_request.hpp b/search/search_tests_support/test_search_request.hpp
index 9f686cf8be..6172716e42 100644
--- a/search/search_tests_support/test_search_request.hpp
+++ b/search/search_tests_support/test_search_request.hpp
@@ -5,13 +5,14 @@
 #include "search/result.hpp"
 #include "search/search_params.hpp"
 
-#include "std/condition_variable.hpp"
-#include "std/mutex.hpp"
-#include "std/string.hpp"
-#include "std/vector.hpp"
-
 #include "base/timer.hpp"
 
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+#include <string>
+#include <vector>
+
 namespace search
 {
 namespace tests_support
@@ -24,7 +25,7 @@ class TestSearchEngine;
 class TestSearchRequest
 {
 public:
-  TestSearchRequest(TestSearchEngine & engine, string const & query, string const & locale,
+  TestSearchRequest(TestSearchEngine & engine, std::string const & query, std::string const & locale,
                     Mode mode, m2::RectD const & viewport);
   TestSearchRequest(TestSearchEngine & engine, SearchParams const & params);
 
@@ -32,11 +33,11 @@ public:
   void Run();
 
   // Call these functions only after call to Wait().
-  steady_clock::duration ResponseTime() const;
-  vector<search::Result> const & Results() const;
+  std::chrono::steady_clock::duration ResponseTime() const;
+  std::vector<search::Result> const & Results() const;
 
 protected:
-  TestSearchRequest(TestSearchEngine & engine, string const & query, string const & locale,
+  TestSearchRequest(TestSearchEngine & engine, std::string const & query, std::string const & locale,
                     Mode mode, m2::RectD const & viewport,
                     SearchParams::OnStarted const & onStarted,
                     SearchParams::OnResults const & onResults);
@@ -56,15 +57,15 @@ protected:
   // Overrides the default onResults callback.
   void SetCustomOnResults(SearchParams::OnResults const & onResults);
 
-  condition_variable m_cv;
-  mutable mutex m_mu;
+  std::condition_variable m_cv;
+  mutable std::mutex m_mu;
 
-  vector<search::Result> m_results;
+  std::vector<search::Result> m_results;
   bool m_done = false;
 
   base::Timer m_timer;
-  steady_clock::duration m_startTime;
-  steady_clock::duration m_endTime;
+  std::chrono::steady_clock::duration m_startTime;
+  std::chrono::steady_clock::duration m_endTime;
 
   TestSearchEngine & m_engine;
   SearchParams m_params;