RPCService implementation

Fix commands UTs

23 files changed, 56 insertions, 34 deletions

diff --git a/src/components/application_manager/src/commands/hmi/get_urls.cc b/src/components/application_manager/src/commands/hmi/get_urls.cc
index bfcdf4985e..a229003eed 100644
--- a/src/components/application_manager/src/commands/hmi/get_urls.cc
+++ b/src/components/application_manager/src/commands/hmi/get_urls.cc
@@ -33,6 +33,7 @@
 #include "application_manager/commands/hmi/get_urls.h"
 #include "application_manager/message.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/rpc_service.h"
 #include "application_manager/policies/policy_handler.h"
 #include "utils/helpers.h"
 
@@ -125,7 +126,7 @@ void GetUrls::ProcessServiceURLs(const policy::EndpointUrls& endpoints) {
 void GetUrls::SendResponseToHMI(hmi_apis::Common_Result::eType result) {
   (*message_)[strings::params][strings::message_type] = MessageType::kResponse;
   (*message_)[strings::params][hmi_response::code] = result;
-  application_manager_.ManageHMICommand(message_);
+  application_manager_.GetRPCService().ManageHMICommand(message_);
 }
 
 #ifdef PROPRIETARY_MODE
diff --git a/src/components/application_manager/src/commands/hmi/get_urls_response.cc b/src/components/application_manager/src/commands/hmi/get_urls_response.cc
index dd9686fbce..806c4ce8b0 100644
--- a/src/components/application_manager/src/commands/hmi/get_urls_response.cc
+++ b/src/components/application_manager/src/commands/hmi/get_urls_response.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/get_urls_response.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 namespace commands {
@@ -46,7 +47,7 @@ void GetUrlsResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.SendMessageToHMI(message_);
+  application_manager_.GetRPCService().SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc b/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc
index 3c2d73b10c..55ecfd6643 100644
--- a/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc
+++ b/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc
@@ -32,6 +32,7 @@
 
 #include "application_manager/commands/hmi/notification_from_hmi.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/rpc_service.h"
 #include "smart_objects/smart_object.h"
 
 namespace application_manager {
@@ -61,7 +62,7 @@ void NotificationFromHMI::SendNotificationToMobile(
     const MessageSharedPtr& message) {
   (*message)[strings::params][strings::message_type] =
       static_cast<int32_t>(application_manager::MessageType::kNotification);
-  application_manager_.ManageMobileCommand(message, ORIGIN_SDL);
+  application_manager_.GetRPCService().ManageMobileCommand(message, ORIGIN_SDL);
 }
 
 void NotificationFromHMI::CreateHMIRequest(
@@ -90,7 +91,7 @@ void NotificationFromHMI::CreateHMIRequest(
 
   request[strings::msg_params] = msg_params;
 
-  if (!application_manager_.ManageHMICommand(result)) {
+  if (!application_manager_.GetRPCService().ManageHMICommand(result)) {
     LOG4CXX_ERROR(logger_, "Unable to send request");
     return;
   }
diff --git a/src/components/application_manager/src/commands/hmi/notification_to_hmi.cc b/src/components/application_manager/src/commands/hmi/notification_to_hmi.cc
index d52df950c3..223111d40a 100644
--- a/src/components/application_manager/src/commands/hmi/notification_to_hmi.cc
+++ b/src/components/application_manager/src/commands/hmi/notification_to_hmi.cc
@@ -32,6 +32,7 @@
 
 #include "application_manager/commands/hmi/notification_to_hmi.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -57,7 +58,7 @@ void NotificationToHMI::Run() {}
 void NotificationToHMI::SendNotification() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
-  application_manager_.SendMessageToHMI(message_);
+  application_manager_.GetRPCService().SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc b/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc
index cb68b21263..c9920e5d18 100644
--- a/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc
@@ -37,6 +37,7 @@
 #include <signal.h>
 
 #include "application_manager/application_manager.h"
+#include "application_manager/rpc_service.h"
 #include "application_manager/resumption/resume_ctrl.h"
 #include "interfaces/HMI_API.h"
 
@@ -107,7 +108,7 @@ void OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete() {
   (*message)[strings::params][strings::correlation_id] =
       application_manager_.GetNextHMICorrelationID();
 
-  application_manager_.ManageHMICommand(message);
+  application_manager_.GetRPCService().ManageHMICommand(message);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc b/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc
index df9dc01eab..8e43fdfd01 100644
--- a/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc
@@ -35,6 +35,7 @@
 #include "application_manager/application_impl.h"
 #include "application_manager/state_controller.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/rpc_service.h"
 #include "interfaces/MOBILE_API.h"
 #include "interfaces/HMI_API.h"
 #ifdef SDL_REMOTE_CONTROL
@@ -82,7 +83,7 @@ void OnExitApplicationNotification::Run() {
       break;
     }
     case Common_ApplicationExitReason::UNAUTHORIZED_TRANSPORT_REGISTRATION: {
-      application_manager_.ManageMobileCommand(
+      application_manager_.GetRPCService().ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
               app_id, AppInterfaceUnregisteredReason::APP_UNAUTHORIZED),
           commands::Command::ORIGIN_SDL);
@@ -91,7 +92,7 @@ void OnExitApplicationNotification::Run() {
       return;
     }
     case Common_ApplicationExitReason::UNSUPPORTED_HMI_RESOURCE: {
-      application_manager_.ManageMobileCommand(
+      application_manager_.GetRPCService().ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
               app_id, AppInterfaceUnregisteredReason::UNSUPPORTED_HMI_RESOURCE),
           commands::Command::ORIGIN_SDL);
diff --git a/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc
index bd152c2af0..f7fe10f332 100644
--- a/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc
@@ -34,6 +34,7 @@
 
 #include "application_manager/application_impl.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/rpc_service.h"
 #include "interfaces/MOBILE_API.h"
 
 namespace application_manager {
@@ -77,7 +78,7 @@ void OnTTSLanguageChangeNotification::Run() {
 
     if (static_cast<int>(app->language()) !=
         (*message_)[strings::msg_params][strings::language].asInt()) {
-      application_manager_.ManageMobileCommand(
+      application_manager_.GetRPCService().ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
               app->app_id(),
               mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE),
diff --git a/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc
index 6e8e38f757..caea874371 100644
--- a/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc
@@ -34,6 +34,7 @@
 
 #include "application_manager/application_impl.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/rpc_service.h"
 #include "interfaces/MOBILE_API.h"
 
 namespace application_manager {
@@ -76,7 +77,7 @@ void OnUILanguageChangeNotification::Run() {
     if (app->ui_language() !=
         (*message_)[strings::msg_params][strings::hmi_display_language]
             .asInt()) {
-      application_manager_.ManageMobileCommand(
+      application_manager_.GetRPCService().ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
               app->app_id(),
               mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE),
diff --git a/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc
index bbdb55cde6..c94a341fcb 100644
--- a/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc
@@ -35,6 +35,7 @@
 #include "application_manager/application_impl.h"
 #include "application_manager/state_controller.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/rpc_service.h"
 #include "interfaces/MOBILE_API.h"
 
 namespace application_manager {
@@ -75,7 +76,7 @@ void OnVRLanguageChangeNotification::Run() {
       application_manager_.state_controller().SetRegularState(
           app, mobile_api::HMILevel::HMI_NONE, false);
 
-      application_manager_.ManageMobileCommand(
+      application_manager_.GetRPCService().ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
               app->app_id(),
               mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE),
diff --git a/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc
index a976ce1044..f2a638ae33 100644
--- a/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc
+++ b/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/rc_is_ready_request.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -91,7 +92,7 @@ void RCIsReadyRequest::SendMessageToHMI() {
   utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::RC_GetCapabilities, application_manager_));
-  application_manager_.ManageHMICommand(get_capabilities);
+  application_manager_.GetRPCService().ManageHMICommand(get_capabilities);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/request_from_hmi.cc b/src/components/application_manager/src/commands/hmi/request_from_hmi.cc
index 5a4e7b149e..10e4ec5141 100644
--- a/src/components/application_manager/src/commands/hmi/request_from_hmi.cc
+++ b/src/components/application_manager/src/commands/hmi/request_from_hmi.cc
@@ -32,6 +32,7 @@
 
 #include "application_manager/commands/hmi/request_from_hmi.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/rpc_service.h"
 #include "utils/make_shared.h"
 
 namespace application_manager {
@@ -74,7 +75,7 @@ void RequestFromHMI::SendResponse(
   (*message)[strings::msg_params][strings::success] = success;
   (*message)[strings::msg_params][strings::result_code] = result_code;
 
-  application_manager_.ManageHMICommand(message);
+  application_manager_.GetRPCService().ManageHMICommand(message);
 }
 
 void RequestFromHMI::SendErrorResponse(
@@ -91,7 +92,7 @@ void RequestFromHMI::SendErrorResponse(
   (*message)[strings::params][hmi_response::code] = result_code;
   (*message)[strings::params][strings::error_msg] = error_message;
 
-  application_manager_.ManageHMICommand(message);
+  application_manager_.GetRPCService().ManageHMICommand(message);
 }
 
 void RequestFromHMI::FillCommonParametersOfSO(
diff --git a/src/components/application_manager/src/commands/hmi/request_to_hmi.cc b/src/components/application_manager/src/commands/hmi/request_to_hmi.cc
index 23c020bca2..d7e889c352 100644
--- a/src/components/application_manager/src/commands/hmi/request_to_hmi.cc
+++ b/src/components/application_manager/src/commands/hmi/request_to_hmi.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/request_to_hmi.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -81,7 +82,7 @@ void RequestToHMI::Run() {
 void RequestToHMI::SendRequest() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
-  application_manager_.SendMessageToHMI(message_);
+  application_manager_.GetRPCService().SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/response_from_hmi.cc b/src/components/application_manager/src/commands/hmi/response_from_hmi.cc
index d6d5d95d07..6ec83debb0 100644
--- a/src/components/application_manager/src/commands/hmi/response_from_hmi.cc
+++ b/src/components/application_manager/src/commands/hmi/response_from_hmi.cc
@@ -31,7 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/response_from_hmi.h"
-
+#include "application_manager/rpc_service.h"
 #include "smart_objects/smart_object.h"
 
 namespace application_manager {
@@ -67,7 +67,7 @@ void ResponseFromHMI::SendResponseToMobile(
     const MessageSharedPtr& message, ApplicationManager& application_manager) {
   (*message)[strings::params][strings::message_type] = MessageType::kResponse;
 
-  application_manager_.ManageMobileCommand(message, ORIGIN_SDL);
+  application_manager_.GetRPCService().ManageMobileCommand(message, ORIGIN_SDL);
 }
 
 void ResponseFromHMI::CreateHMIRequest(
@@ -95,7 +95,7 @@ void ResponseFromHMI::CreateHMIRequest(
 
   request[strings::msg_params] = msg_params;
 
-  if (!application_manager_.ManageHMICommand(result)) {
+  if (!application_manager_.GetRPCService().ManageHMICommand(result)) {
     LOG4CXX_ERROR(logger_, "Unable to send request");
     return;
   }
diff --git a/src/components/application_manager/src/commands/hmi/response_to_hmi.cc b/src/components/application_manager/src/commands/hmi/response_to_hmi.cc
index de1e1e0fde..c662bd629c 100644
--- a/src/components/application_manager/src/commands/hmi/response_to_hmi.cc
+++ b/src/components/application_manager/src/commands/hmi/response_to_hmi.cc
@@ -32,6 +32,7 @@
 
 #include "application_manager/commands/hmi/response_to_hmi.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -56,7 +57,7 @@ void ResponseToHMI::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.SendMessageToHMI(message_);
+  application_manager_.GetRPCService().SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc
index 75a8c0b241..e63ec0f6ee 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/sdl_activate_app_response.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -47,7 +48,7 @@ void SDLActivateAppResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.SendMessageToHMI(message_);
+  application_manager_.GetRPCService().SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc
index 521b59a0ec..11a6f77ef0 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/sdl_get_list_of_permissions_response.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -47,7 +48,7 @@ void SDLGetListOfPermissionsResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.SendMessageToHMI(message_);
+  application_manager_.GetRPCService().SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc
index 0af7e0217a..b1d3ffec62 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/sdl_get_status_update_response.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -47,7 +48,7 @@ void SDLGetStatusUpdateResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.SendMessageToHMI(message_);
+  application_manager_.GetRPCService().SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc
index c693625dbb..5bf3527233 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/sdl_get_user_friendly_message_response.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -47,7 +48,7 @@ void SDLGetUserFriendlyMessageResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.SendMessageToHMI(message_);
+  application_manager_.GetRPCService().SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc
index 71e89dd9b9..85a6405196 100644
--- a/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc
+++ b/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/tts_is_ready_request.h"
+#include "application_manager/rpc_service.h"
 #include "application_manager/message_helper.h"
 
 namespace application_manager {
@@ -90,16 +91,16 @@ void TTSIsReadyRequest::SendMessageToHMI() {
                                         application_manager_));
   HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
   hmi_capabilities.set_handle_response_for(*get_language);
-  application_manager_.ManageHMICommand(get_language);
+  application_manager_.GetRPCService().ManageHMICommand(get_language);
   utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::TTS_GetSupportedLanguages,
           application_manager_));
-  application_manager_.ManageHMICommand(get_all_languages);
+  application_manager_.GetRPCService().ManageHMICommand(get_all_languages);
   utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::TTS_GetCapabilities, application_manager_));
-  application_manager_.ManageHMICommand(get_capabilities);
+  application_manager_.GetRPCService().ManageHMICommand(get_capabilities);
 }
 }  // namespace commands
 
diff --git a/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc
index 9e27e23d34..5d7f6d0f4e 100644
--- a/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc
@@ -32,6 +32,7 @@
 
 #include "application_manager/commands/hmi/ui_is_ready_request.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -89,16 +90,16 @@ void UIIsReadyRequest::SendMessageToHMI() {
                                         application_manager_));
   HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
   hmi_capabilities.set_handle_response_for(*get_language);
-  application_manager_.ManageHMICommand(get_language);
+  application_manager_.GetRPCService().ManageHMICommand(get_language);
   utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::UI_GetSupportedLanguages,
           application_manager_));
-  application_manager_.ManageHMICommand(get_all_languages);
+  application_manager_.GetRPCService().ManageHMICommand(get_all_languages);
   utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::UI_GetCapabilities, application_manager_));
-  application_manager_.ManageHMICommand(get_capabilities);
+  application_manager_.GetRPCService().ManageHMICommand(get_capabilities);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/update_sdl_response.cc b/src/components/application_manager/src/commands/hmi/update_sdl_response.cc
index 0e8978fe89..f8fa188735 100644
--- a/src/components/application_manager/src/commands/hmi/update_sdl_response.cc
+++ b/src/components/application_manager/src/commands/hmi/update_sdl_response.cc
@@ -30,6 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "application_manager/commands/hmi/update_sdl_response.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -46,7 +47,7 @@ void UpdateSDLResponse::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  application_manager_.SendMessageToHMI(message_);
+  application_manager_.GetRPCService().SendMessageToHMI(message_);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc
index ddd08695a0..4d9f30baaa 100644
--- a/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/vi_is_ready_request.h"
+#include "application_manager/rpc_service.h"
 #include "application_manager/message_helper.h"
 
 namespace application_manager {
@@ -95,7 +96,7 @@ void VIIsReadyRequest::SendMessageToHMI() {
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::VehicleInfo_GetVehicleType,
           application_manager_));
-  application_manager_.ManageHMICommand(get_type);
+  application_manager_.GetRPCService().ManageHMICommand(get_type);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc
index 086b5d4490..a1509b153f 100644
--- a/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc
+++ b/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc
@@ -31,6 +31,7 @@
  */
 
 #include "application_manager/commands/hmi/vr_is_ready_request.h"
+#include "application_manager/rpc_service.h"
 
 namespace application_manager {
 
@@ -89,16 +90,16 @@ void VRIsReadyRequest::SendMessageToHMI() {
                                         application_manager_));
   HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities();
   hmi_capabilities.set_handle_response_for(*get_language);
-  application_manager_.ManageHMICommand(get_language);
+  application_manager_.GetRPCService().ManageHMICommand(get_language);
   utils::SharedPtr<smart_objects::SmartObject> get_all_languages(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::VR_GetSupportedLanguages,
           application_manager_));
-  application_manager_.ManageHMICommand(get_all_languages);
+  application_manager_.GetRPCService().ManageHMICommand(get_all_languages);
   utils::SharedPtr<smart_objects::SmartObject> get_capabilities(
       MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::VR_GetCapabilities, application_manager_));
-  application_manager_.ManageHMICommand(get_capabilities);
+  application_manager_.GetRPCService().ManageHMICommand(get_capabilities);
 }
 
 }  // namespace commands