remove my::make_unique

4 files changed, 20 insertions, 18 deletions

diff --git a/partners_api/ads_engine.cpp b/partners_api/ads_engine.cpp
index f148044b3f..dc22872ebd 100644
--- a/partners_api/ads_engine.cpp
+++ b/partners_api/ads_engine.cpp
@@ -6,19 +6,18 @@
 
 #include "indexer/feature_data.hpp"
 
-#include "base/stl_add.hpp"
-
 #include <algorithm>
+#include <memory>
 
 namespace ads
 {
 Engine::Engine()
 {
   // The banner systems are placed by priority. First has a top priority.
-  m_banners.emplace_back(Banner::Type::RB, my::make_unique<Rb>());
-  m_banners.emplace_back(Banner::Type::Mopub, my::make_unique<Mopub>());
+  m_banners.emplace_back(Banner::Type::RB, std::make_unique<Rb>());
+  m_banners.emplace_back(Banner::Type::Mopub, std::make_unique<Mopub>());
 
-  m_searchBanners.emplace_back(Banner::Type::Facebook, my::make_unique<Facebook>());
+  m_searchBanners.emplace_back(Banner::Type::Facebook, std::make_unique<Facebook>());
 }
 
 bool Engine::HasBanner(feature::TypesHolder const & types,
diff --git a/partners_api/partners_api_tests/taxi_engine_tests.cpp b/partners_api/partners_api_tests/taxi_engine_tests.cpp
index 961e92485d..3e3f1ba884 100644
--- a/partners_api/partners_api_tests/taxi_engine_tests.cpp
+++ b/partners_api/partners_api_tests/taxi_engine_tests.cpp
@@ -12,9 +12,10 @@
 #include "geometry/latlon.hpp"
 
 #include "base/scope_guard.hpp"
-#include "base/stl_add.hpp"
 #include "base/worker_thread.hpp"
 
+#include <memory>
+
 using namespace platform::tests_support;
 
 namespace
@@ -392,7 +393,7 @@ UNIT_CLASS_TEST(AsyncGuiThread, TaxiEngine_Smoke)
                        {taxi::Provider::Type::Yandex, kTesturl},
                        {taxi::Provider::Type::Maxim, kTesturl}});
 
-  engine.SetDelegate(my::make_unique<BelarusMinskDelegate>());
+  engine.SetDelegate(std::make_unique<BelarusMinskDelegate>());
 
   taxi::ProvidersContainer const synchronousProviders =
       GetProvidersSynchronous(engine, from, to, kTesturl);
@@ -437,32 +438,32 @@ UNIT_TEST(TaxiEngine_GetProvidersAtPos)
   ms::LatLon latlon(0.0, 0.0);
   std::vector<taxi::Provider::Type> providers;
 
-  engine.SetDelegate(my::make_unique<BelarusMinskDelegate>());
+  engine.SetDelegate(std::make_unique<BelarusMinskDelegate>());
   providers = engine.GetProvidersAtPos(latlon);
   TEST_EQUAL(providers.size(), 1, ());
   TEST_EQUAL(providers[0], taxi::Provider::Type::Yandex, ());
 
-  engine.SetDelegate(my::make_unique<UkraineOdessaDelegate>());
+  engine.SetDelegate(std::make_unique<UkraineOdessaDelegate>());
   providers = engine.GetProvidersAtPos(latlon);
   TEST_EQUAL(providers.size(), 1, ());
   TEST_EQUAL(providers[0], taxi::Provider::Type::Yandex, ());
 
-  engine.SetDelegate(my::make_unique<UkraineMariupolDelegate>());
+  engine.SetDelegate(std::make_unique<UkraineMariupolDelegate>());
   providers = engine.GetProvidersAtPos(latlon);
   TEST_EQUAL(providers.size(), 1, ());
   TEST_EQUAL(providers[0], taxi::Provider::Type::Maxim, ());
 
-  engine.SetDelegate(my::make_unique<BulgariaSofiaDelegate>());
+  engine.SetDelegate(std::make_unique<BulgariaSofiaDelegate>());
   providers = engine.GetProvidersAtPos(latlon);
   TEST_EQUAL(providers.size(), 1, ());
   TEST_EQUAL(providers[0], taxi::Provider::Type::Maxim, ());
 
-  engine.SetDelegate(my::make_unique<UsaDelegate>());
+  engine.SetDelegate(std::make_unique<UsaDelegate>());
   providers = engine.GetProvidersAtPos(latlon);
   TEST_EQUAL(providers.size(), 1, ());
   TEST_EQUAL(providers[0], taxi::Provider::Type::Uber, ());
 
-  engine.SetDelegate(my::make_unique<RussiaKonetsDelegate>());
+  engine.SetDelegate(std::make_unique<RussiaKonetsDelegate>());
   providers = engine.GetProvidersAtPos(latlon);
   TEST(providers.empty(), (providers));
 }
diff --git a/partners_api/taxi_engine.cpp b/partners_api/taxi_engine.cpp
index eaa4c8f924..286a4302fc 100644
--- a/partners_api/taxi_engine.cpp
+++ b/partners_api/taxi_engine.cpp
@@ -8,11 +8,11 @@
 #include "geometry/mercator.hpp"
 
 #include "base/macros.hpp"
-#include "base/stl_add.hpp"
 
 #include <algorithm>
 #include <initializer_list>
 #include <iterator>
+#include <memory>
 #include <utility>
 
 namespace
@@ -237,8 +237,8 @@ void Engine::AddApi(std::vector<ProviderUrl> const & urls, Provider::Type type)
   });
 
   if (it != urls.cend())
-    m_apis.emplace_back(type, my::make_unique<ApiType>(it->m_url));
+    m_apis.emplace_back(type, std::make_unique<ApiType>(it->m_url));
   else
-    m_apis.emplace_back(type, my::make_unique<ApiType>());
+    m_apis.emplace_back(type, std::make_unique<ApiType>());
 }
 }  // namespace taxi
diff --git a/partners_api/uber_api.cpp b/partners_api/uber_api.cpp
index b0d1f0a006..11dbb3ca16 100644
--- a/partners_api/uber_api.cpp
+++ b/partners_api/uber_api.cpp
@@ -15,6 +15,8 @@
 
 #include "private.h"
 
+#include <memory>
+
 using namespace platform;
 
 namespace
@@ -215,11 +217,11 @@ void ProductMaker::MakeProducts(uint64_t const requestId, ProductsCallback const
         MakeFromJson(m_times->c_str(), m_prices->c_str(), products);
 
       if (products.empty())
-        m_error = my::make_unique<taxi::ErrorCode>(ErrorCode::NoProducts);
+        m_error = std::make_unique<taxi::ErrorCode>(ErrorCode::NoProducts);
     }
 
     if (m_error)
-      error = my::make_unique<taxi::ErrorCode>(*m_error);
+      error = std::make_unique<taxi::ErrorCode>(*m_error);
 
     // Reset m_times and m_prices because we need to call callback only once.
     m_times.reset();