Fix issues after rebase

6 files changed, 9 insertions, 8 deletions

diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index ca0bb51b31..dc16e14023 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -762,7 +762,7 @@ class MessageHelper {
    * @param application Application to unsubscribe
    * @param app_mngr Application manager
    */
-  static void SendUnsubscribeIVIRequest(uint32_t ivi_id,
+  static void SendUnsubscribeIVIRequest(int32_t ivi_id,
                                         ApplicationSharedPtr application,
                                         ApplicationManager& app_mngr);
 
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index 34a35e5929..4ae6ce4024 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -613,7 +613,7 @@ void MessageHelper::SendUnsubscribeButtonNotification(
   app_mngr.ManageHMICommand(message);
 }
 
-void MessageHelper::SendUnsubscribeIVIRequest(uint32_t ivi_id,
+void MessageHelper::SendUnsubscribeIVIRequest(int32_t ivi_id,
                                               ApplicationSharedPtr application,
                                               ApplicationManager& app_mngr) {
   using namespace smart_objects;
diff --git a/src/components/application_manager/test/application_helper_test.cc b/src/components/application_manager/test/application_helper_test.cc
index ce33dc6b45..a0b6fd6aa2 100644
--- a/src/components/application_manager/test/application_helper_test.cc
+++ b/src/components/application_manager/test/application_helper_test.cc
@@ -45,7 +45,6 @@
 #include "application_manager/usage_statistics.h"
 #include "application_manager/helpers/application_helper.h"
 #include "application_manager/smart_object_keys.h"
-#include "application_manager/vehicle_info_data.h"
 #include "interfaces/MOBILE_API.h"
 #include "connection_handler/device.h"
 #include "smart_objects/smart_object.h"
@@ -135,7 +134,8 @@ TEST_F(ApplicationHelperTest, RecallApplicationData_ExpectAppDataReset) {
   const uint32_t cmd_id = 1;
   const uint32_t menu_id = 2;
   const uint32_t choice_set_id = 3;
-  const VehicleDataType vi = VehicleDataType::ACCPEDAL;
+  const mobile_apis::VehicleDataType::eType vi =
+      mobile_apis::VehicleDataType::VEHICLEDATA_ACCPEDAL;
   const mobile_apis::ButtonName::eType button = mobile_apis::ButtonName::AC;
 
   smart_objects::SmartObject cmd;
@@ -230,7 +230,8 @@ TEST_F(ApplicationHelperTest, RecallApplicationData_ExpectHMICleanupRequests) {
   app_impl_->AddCommand(cmd_id, cmd[strings::msg_params]);
   app_impl_->AddSubMenu(menu_id, cmd[strings::menu_params]);
   app_impl_->AddChoiceSet(choice_set_id, cmd[strings::msg_params]);
-  app_impl_->SubscribeToIVI(static_cast<uint32_t>(VehicleDataType::ACCPEDAL));
+  app_impl_->SubscribeToIVI(static_cast<uint32_t>(
+      mobile_apis::VehicleDataType::VEHICLEDATA_ACCPEDAL));
   app_impl_->SubscribeToButton(mobile_apis::ButtonName::AC);
 
   EXPECT_CALL(*mock_message_helper_, SendUnsubscribedWayPoints(_));
diff --git a/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc b/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc
index 08aaa724e2..87127231be 100644
--- a/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc
+++ b/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc
@@ -112,7 +112,7 @@ TEST_F(SubscribeWayPointsRequestTest, OnEvent_SUCCESS) {
     InSequence dummy;
     EXPECT_CALL(app_mngr_,
                 SubscribeAppForWayPoints(A<am::ApplicationSharedPtr>()));
-    EXPECT_CALL(*mock_message_helper, HMIToMobileResult(result_code))
+    EXPECT_CALL(mock_message_helper_, HMIToMobileResult(result_code))
         .WillOnce(Return(mobile_apis::Result::SUCCESS));
     EXPECT_CALL(app_mngr_, ManageMobileCommand(_, _));
     EXPECT_CALL(*app, UpdateHash());
diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
index e03ff343fb..7598e33e19 100644
--- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h
+++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
@@ -288,7 +288,7 @@ class MockMessageHelper {
                     ApplicationSharedPtr application,
                     ApplicationManager& app_mngr));
   MOCK_METHOD3(SendUnsubscribeIVIRequest,
-               void(uint32_t ivi_id,
+               void(int32_t ivi_id,
                     ApplicationSharedPtr application,
                     ApplicationManager& app_mngr));
 
diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc
index 6805d43693..2a74f5b3b1 100644
--- a/src/components/application_manager/test/mock_message_helper.cc
+++ b/src/components/application_manager/test/mock_message_helper.cc
@@ -536,7 +536,7 @@ void MessageHelper::SendUnsubscribeButtonNotification(
       ->SendUnsubscribeButtonNotification(button, application, app_mngr);
 }
 
-void MessageHelper::SendUnsubscribeIVIRequest(uint32_t ivi_id,
+void MessageHelper::SendUnsubscribeIVIRequest(int32_t ivi_id,
                                               ApplicationSharedPtr application,
                                               ApplicationManager& app_mngr) {
   return MockMessageHelper::message_helper_mock()->SendUnsubscribeIVIRequest(