From 28dccd645cd2557d2d8c42377fb3b0085a23fdaf Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Thu, 14 May 2015 15:22:15 +0300
Subject: [PATCH] Rebasing on master and solving conflicts.

---
 integration_tests/online_cross_tests.cpp | 2 +-
 integration_tests/osrm_test_tools.cpp    | 6 +++---
 integration_tests/osrm_test_tools.hpp    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/integration_tests/online_cross_tests.cpp b/integration_tests/online_cross_tests.cpp
index 158d963d5f..e8bbdda1d4 100644
--- a/integration_tests/online_cross_tests.cpp
+++ b/integration_tests/online_cross_tests.cpp
@@ -6,7 +6,7 @@ namespace
 {
 UNIT_TEST(OnlineRussiaNorthToSouthTest)
 {
-  shared_ptr<integration::OsrmRouterComponents> routerComponents = integration::GetAllMaps();
+  integration::OsrmRouterComponents & routerComponents  = integration::GetAllMaps();
   TestOnlineCrosses({34.45, 61.76}, {38.94, 45.07},
                     {"Russia_Central", "Russia_Southern", "Russia_Northwestern"}, routerComponents);
 }
diff --git a/integration_tests/osrm_test_tools.cpp b/integration_tests/osrm_test_tools.cpp
index 64447eb402..dff7b63922 100644
--- a/integration_tests/osrm_test_tools.cpp
+++ b/integration_tests/osrm_test_tools.cpp
@@ -130,7 +130,7 @@ namespace integration
     return LoadMaps(maps);
   }
 
-  OsrmRouterComponents const & GetAllMaps()
+  OsrmRouterComponents & GetAllMaps()
   {
     static shared_ptr<OsrmRouterComponents> const inst = LoadAllMaps();
     ASSERT(inst, ());
@@ -255,14 +255,14 @@ namespace integration
 
   void TestOnlineCrosses(m2::PointD const & startPoint, m2::PointD const & finalPoint,
                          vector<string> const & expected,
-                         shared_ptr<OsrmRouterComponents> & routerComponents)
+                         OsrmRouterComponents & routerComponents)
   {
     routing::OnlineCrossFetcher fetcher(OSRM_ONLINE_SERVER_URL, startPoint, finalPoint);
     vector<m2::PointD> const & points = fetcher.GetMwmPoints();
     TEST_EQUAL(points.size(), expected.size(), ());
     for (m2::PointD const & point : points)
     {
-      string const mwmName = routerComponents->GetSearchEngine()->GetCountryFile(point);
+      string const mwmName = routerComponents.GetSearchEngine()->GetCountryFile(point);
       TEST(find(expected.begin(), expected.end(), mwmName) != expected.end(), ());
     }
   }
diff --git a/integration_tests/osrm_test_tools.hpp b/integration_tests/osrm_test_tools.hpp
index 4a44e4ee85..1db3cf9ad6 100644
--- a/integration_tests/osrm_test_tools.hpp
+++ b/integration_tests/osrm_test_tools.hpp
@@ -45,7 +45,7 @@ namespace integration
                          vector<string> const & expected,
                          OsrmRouterComponents & routerComponents);
 
-  OsrmRouterComponents const & GetAllMaps();
+  OsrmRouterComponents & GetAllMaps();
   shared_ptr<OsrmRouterComponents> LoadMaps(vector<string> const & mapNames);
   TRouteResult CalculateRoute(OsrmRouterComponents const & routerComponents,
                               m2::PointD const & startPoint, m2::PointD const & startDirection,