[new downloader] Review fixes.

5 files changed, 6 insertions, 6 deletions

diff --git a/storage/storage_integration_tests/migrate_tests.cpp b/storage/storage_integration_tests/migrate_tests.cpp
index c98499b682..dca8252905 100644
--- a/storage/storage_integration_tests/migrate_tests.cpp
+++ b/storage/storage_integration_tests/migrate_tests.cpp
@@ -69,7 +69,7 @@ UNIT_TEST(StorageMigrationTests)
     }
   };
 
-  auto progressChanged = [](TCountryId const & id, LocalAndRemoteSizeT const & sz)
+  auto progressChanged = [](TCountryId const & id, TLocalAndRemoteSize const & sz)
   {
     LOG_SHORT(LINFO, (id, "downloading progress:", sz));
   };
diff --git a/storage/storage_integration_tests/storage_downloading_tests.cpp b/storage/storage_integration_tests/storage_downloading_tests.cpp
index 1eb3cb7cb7..bad79c6708 100644
--- a/storage/storage_integration_tests/storage_downloading_tests.cpp
+++ b/storage/storage_integration_tests/storage_downloading_tests.cpp
@@ -67,7 +67,7 @@ UNIT_TEST(SmallMwms_InterruptDownloadResumeDownload_Test)
     Storage storage(COUNTRIES_MIGRATE_FILE);
     TEST(version::IsSingleMwm(storage.GetCurrentDataVersion()), ());
 
-    auto onProgressFn = [](TCountryId const & countryId, LocalAndRemoteSizeT const & mapSize)
+    auto onProgressFn = [](TCountryId const & countryId, TLocalAndRemoteSize const & mapSize)
     {
       TEST_EQUAL(countryId, kCountryId, ());
       // Interrupt download
@@ -90,7 +90,7 @@ UNIT_TEST(SmallMwms_InterruptDownloadResumeDownload_Test)
 
   Storage storage(COUNTRIES_MIGRATE_FILE);
 
-  auto onProgressFn = [](TCountryId const & countryId, LocalAndRemoteSizeT const & mapSize)
+  auto onProgressFn = [](TCountryId const & countryId, TLocalAndRemoteSize const & mapSize)
   {
     TEST_EQUAL(countryId, kCountryId, ());
   };
diff --git a/storage/storage_integration_tests/storage_group_download_tests.cpp b/storage/storage_integration_tests/storage_group_download_tests.cpp
index d3b55056b7..d41b69bff8 100644
--- a/storage/storage_integration_tests/storage_group_download_tests.cpp
+++ b/storage/storage_integration_tests/storage_group_download_tests.cpp
@@ -79,7 +79,7 @@ void DownloadGroup(Storage & storage, bool oneByOne)
   };
 
   TCountriesSet downloaded;
-  auto onProgressFn = [&](TCountryId const & countryId, LocalAndRemoteSizeT const & mapSize)
+  auto onProgressFn = [&](TCountryId const & countryId, TLocalAndRemoteSize const & mapSize)
   {
     TEST(children.find(countryId) != children.end(), ());
     if (mapSize.first == mapSize.second)
diff --git a/storage/storage_integration_tests/storage_http_tests.cpp b/storage/storage_integration_tests/storage_http_tests.cpp
index 3f18f10cef..340314e74b 100644
--- a/storage/storage_integration_tests/storage_http_tests.cpp
+++ b/storage/storage_integration_tests/storage_http_tests.cpp
@@ -30,7 +30,7 @@ string const kMapTestDir = "map-tests";
 
 string const kTestWebServer = "http://new-search.mapswithme.com/";
 
-void ProgressFunction(TCountryId const & countryId, LocalAndRemoteSizeT const & mapSize)
+void ProgressFunction(TCountryId const & countryId, TLocalAndRemoteSize const & mapSize)
 {
   TEST_EQUAL(countryId, kCountryId, ());
 }
diff --git a/storage/storage_integration_tests/storage_update_tests.cpp b/storage/storage_integration_tests/storage_update_tests.cpp
index 920ed98a99..a84be7050e 100644
--- a/storage/storage_integration_tests/storage_update_tests.cpp
+++ b/storage/storage_integration_tests/storage_update_tests.cpp
@@ -84,7 +84,7 @@ UNIT_TEST(SmallMwms_Update_Test)
 
   Platform & platform = GetPlatform();
 
-  auto onProgressFn = [&](TCountryId const & countryId, LocalAndRemoteSizeT const & mapSize) {};
+  auto onProgressFn = [&](TCountryId const & countryId, TLocalAndRemoteSize const & mapSize) {};
 
   // Download countries.txt for version 1
   TEST(DownloadFile(GetCountriesTxtWebUrl(kMwmVersion1), GetCountriesTxtFilePath(), kCountriesTxtFileSize1), ());