Move new RPCs to sdl_rpc_plugin and make some fixes after rebase

16 files changed, 107 insertions, 66 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_get_system_time_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_request.h
index 1dd0d8c6bb..2208671e0b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_get_system_time_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_request.h
@@ -30,20 +30,22 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_REQUEST_H_
-#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_REQUEST_H_
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_REQUEST_H_
 
-#include "application_manager/commands/hmi/request_to_hmi.h"
+#include "application_manager/commands/request_to_hmi.h"
 #include "utils/macro.h"
 
-namespace application_manager {
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
 namespace commands {
 
 /**
  * @brief The BasicCommunicationGetSystemTimeRequest class sends the request
  * to the HMI in order to receive current system time.
  */
-class BasicCommunicationGetSystemTimeRequest : public RequestToHMI {
+class BasicCommunicationGetSystemTimeRequest
+    : public app_mngr::commands::RequestToHMI {
  public:
   /**
    * @brief BasicCommunicationGetSystemTimeRequest does nothing except of
@@ -53,7 +55,11 @@ class BasicCommunicationGetSystemTimeRequest : public RequestToHMI {
    * is provides neccessary api to send the request.
    */
   BasicCommunicationGetSystemTimeRequest(
-      const MessageSharedPtr& message, ApplicationManager& application_manager);
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handler);
 
   /**
    * @brief onTimeOut allows to handle case when
@@ -64,5 +70,5 @@ class BasicCommunicationGetSystemTimeRequest : public RequestToHMI {
 };
 
 }  // namespace commands
-}  // namespace application_manager
-#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_REQUEST_H_
+}  // namespace sdl_rpc_plugin
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_REQUEST_H_
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_get_system_time_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_response.h
index 5e9ae4b1bb..90160d9953 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_get_system_time_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_response.h
@@ -30,23 +30,24 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_RESPONSE_H_
-#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_RESPONSE_H_
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_RESPONSE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_RESPONSE_H_
 
-#include "application_manager/commands/hmi/response_from_hmi.h"
+#include "application_manager/commands/response_from_hmi.h"
 
 #include "utils/macro.h"
 #include "application_manager/application_manager_impl.h"
 
-namespace application_manager {
-
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
 namespace commands {
 
 /**
  * @brief The BasicCommunicationGetSystemTimeResponse class represents the
  * HMI response which is contains data obtained from HMI.
  */
-class BasicCommunicationGetSystemTimeResponse : public ResponseFromHMI {
+class BasicCommunicationGetSystemTimeResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief BasicCommunicationGetSystemTimeResponse does nothing except of
@@ -56,7 +57,11 @@ class BasicCommunicationGetSystemTimeResponse : public ResponseFromHMI {
    * neccessary api to send the request.
    */
   BasicCommunicationGetSystemTimeResponse(
-      const MessageSharedPtr& message, ApplicationManager& application_manager);
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handler);
 
   /**
    * @brief Run takes the message obtained from the HMI and
@@ -66,6 +71,6 @@ class BasicCommunicationGetSystemTimeResponse : public ResponseFromHMI {
 };
 
 }  // namespace commands
-}  // namespace application_manager
+}  // namespace sdl_rpc_plugin
 
-#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_RESPONSE_H_
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_GET_SYSTEM_TIME_RESPONSE_H_
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_time_ready_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_time_ready_notification.h
index c3031da809..0beba8dc6b 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_time_ready_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_time_ready_notification.h
@@ -30,14 +30,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_TIME_READY_NOTIFICATION_H_
-#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_TIME_READY_NOTIFICATION_H_
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_TIME_READY_NOTIFICATION_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_TIME_READY_NOTIFICATION_H_
 
-#include "application_manager/commands/hmi/notification_from_hmi.h"
+#include "application_manager/commands/notification_from_hmi.h"
 #include "application_manager/application_manager_impl.h"
 
-namespace application_manager {
-
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
 namespace commands {
 
 /**
@@ -47,14 +47,19 @@ namespace commands {
  * to obtain system time. Once SDL receive this notification
  * it is allowed to use GetSystemTimeRequest to rerieve system time.
  */
-class OnSystemTimeReadyNotification : public NotificationFromHMI {
+class OnSystemTimeReadyNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnSystemTimeReadyNotification create the command.
    * @param message content of the command. Passed directy to base class.
    */
-  OnSystemTimeReadyNotification(const MessageSharedPtr& message,
-                                ApplicationManager& application_manager);
+  OnSystemTimeReadyNotification(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handler);
 
   /**
    * @brief ~OnSystemTimeReadyNotification destroys the command object.
@@ -69,6 +74,6 @@ class OnSystemTimeReadyNotification : public NotificationFromHMI {
 };
 
 }  // namespace commands
-}  // namespace application_manager
+}  // namespace sdl_rpc_plugin
 
-#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_SYSTEM_TIME_READY_NOTIFICATION_H_
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_TIME_READY_NOTIFICATION_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h
index e139e3faf4..9cac2ab34f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h
@@ -217,7 +217,7 @@ class RegisterAppInterfaceRequest
 
  private:
   std::string response_info_;
-  mobile_apis::Result::eType result_checking_app_hmi_type_;
+  mobile_apis::Result::eType result_code_;
 
   policy::PolicyHandlerInterface& GetPolicyHandler();
   DISALLOW_COPY_AND_ASSIGN(RegisterAppInterfaceRequest);
diff --git a/src/components/application_manager/src/commands/hmi/basic_communication_get_system_time_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_request.cc
index 215b0404a7..fb87612e19 100644
--- a/src/components/application_manager/src/commands/hmi/basic_communication_get_system_time_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_request.cc
@@ -30,15 +30,24 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "application_manager/commands/hmi/basic_communication_get_system_time_request.h"
+#include "sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_request.h"
 
-namespace application_manager {
+namespace sdl_rpc_plugin {
+using namespace application_manager;
 
 namespace commands {
 
 BasicCommunicationGetSystemTimeRequest::BasicCommunicationGetSystemTimeRequest(
-    const MessageSharedPtr& message, ApplicationManager& application_manager)
-    : RequestToHMI(message, application_manager) {}
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    app_mngr::rpc_service::RPCService& rpc_service,
+    app_mngr::HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : RequestToHMI(message,
+                   application_manager,
+                   rpc_service,
+                   hmi_capabilities,
+                   policy_handler) {}
 
 void BasicCommunicationGetSystemTimeRequest::onTimeOut() {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -46,4 +55,4 @@ void BasicCommunicationGetSystemTimeRequest::onTimeOut() {
 }
 
 }  // namespace commands
-}  // namespace application_manager
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/src/commands/hmi/basic_communication_get_system_time_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_response.cc
index 26dd115d1a..c067debf36 100644
--- a/src/components/application_manager/src/commands/hmi/basic_communication_get_system_time_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_response.cc
@@ -30,19 +30,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "application_manager/commands/hmi/basic_communication_get_system_time_response.h"
+#include "sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_response.h"
 #include "utils/logger.h"
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "Commands")
 
-namespace application_manager {
+namespace sdl_rpc_plugin {
+using namespace application_manager;
 namespace commands {
 
 BasicCommunicationGetSystemTimeResponse::
     BasicCommunicationGetSystemTimeResponse(
-        const MessageSharedPtr& message,
-        ApplicationManager& application_manager)
-    : ResponseFromHMI(message, application_manager) {}
+        const application_manager::commands::MessageSharedPtr& message,
+        ApplicationManager& application_manager,
+        rpc_service::RPCService& rpc_service,
+        HMICapabilities& hmi_capabilities,
+        policy::PolicyHandlerInterface& policy_handler)
+    : ResponseFromHMI(message,
+                      application_manager,
+                      rpc_service,
+                      hmi_capabilities,
+                      policy_handler) {}
 
 void BasicCommunicationGetSystemTimeResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
diff --git a/src/components/application_manager/src/commands/hmi/on_system_time_ready_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_time_ready_notification.cc
index d2376e6dfe..b5fd1a007e 100644
--- a/src/components/application_manager/src/commands/hmi/on_system_time_ready_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_time_ready_notification.cc
@@ -30,18 +30,24 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "application_manager/commands/hmi/on_system_time_ready_notification.h"
+#include "sdl_rpc_plugin/commands/hmi/on_system_time_ready_notification.h"
 
 #include "application_manager/event_engine/event.h"
 #include "interfaces/HMI_API.h"
 
-namespace application_manager {
+namespace sdl_rpc_plugin {
+using namespace application_manager;
 
 namespace commands {
 
 OnSystemTimeReadyNotification::OnSystemTimeReadyNotification(
-    const MessageSharedPtr& message, ApplicationManager& application_manager)
-    : NotificationFromHMI(message, application_manager) {}
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& app_man,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : NotificationFromHMI(
+          message, app_man, rpc_service, hmi_capabilities, policy_handler) {}
 
 OnSystemTimeReadyNotification::~OnSystemTimeReadyNotification() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
index 11acd8a733..bb621f814c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
@@ -271,7 +271,6 @@
 #include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h"
 #include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h"
 
-CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager")
 namespace sdl_rpc_plugin {
 using namespace application_manager;
 
@@ -892,9 +891,7 @@ CommandCreator& HMICommandFactory::get_creator_factory(
       return factory.GetCreator<commands::OnReadyNotification>();
     }
     case hmi_apis::FunctionID::BasicCommunication_OnSystemTimeReady: {
-      command.reset(new commands::OnSystemTimeReadyNotification(
-          message, application_manager));
-      break;
+      return factory.GetCreator<commands::OnSystemTimeReadyNotification>();
     }
     case hmi_apis::FunctionID::BasicCommunication_OnDeviceChosen: {
       return factory.GetCreator<commands::OnDeviceChosenNotification>();
@@ -1644,14 +1641,11 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                        commands::BasicCommunicationSystemResponse>();
     }
     case hmi_apis::FunctionID::BasicCommunication_GetSystemTime: {
-      if (is_response) {
-        command.reset(new commands::BasicCommunicationGetSystemTimeResponse(
-            message, application_manager));
-      } else {
-        command.reset(new commands::BasicCommunicationGetSystemTimeRequest(
-            message, application_manager));
-      }
-      break;
+      return hmi_apis::messageType::request == message_type
+                 ? factory.GetCreator<
+                       commands::BasicCommunicationGetSystemTimeRequest>()
+                 : factory.GetCreator<
+                       commands::BasicCommunicationGetSystemTimeResponse>();
     }
     case hmi_apis::FunctionID::Navigation_SendLocation: {
       return hmi_apis::messageType::request == message_type
diff --git a/src/components/application_manager/test/commands/hmi/basic_communication_get_system_time_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_request_test.cc
index e6a6bf0365..78fec997e9 100644
--- a/src/components/application_manager/test/commands/hmi/basic_communication_get_system_time_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_request_test.cc
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "application_manager/commands/hmi/basic_communication_get_system_time_request.h"
+#include "hmi/basic_communication_get_system_time_request.h"
 
 #include "gtest/gtest.h"
 #include "utils/shared_ptr.h"
@@ -46,7 +46,7 @@ namespace basic_communication_get_system_time_request {
 using ::testing::ReturnRef;
 namespace am = ::application_manager;
 using am::commands::MessageSharedPtr;
-using am::commands::BasicCommunicationGetSystemTimeRequest;
+using sdl_rpc_plugin::commands::BasicCommunicationGetSystemTimeRequest;
 using namespace ::protocol_handler;
 
 class BasicCommunicationGetSystemTimeRequestTest
diff --git a/src/components/application_manager/test/commands/hmi/basic_communication_get_system_time_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_response_test.cc
index e4d4572bc1..8f56c6462c 100644
--- a/src/components/application_manager/test/commands/hmi/basic_communication_get_system_time_response_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_response_test.cc
@@ -32,7 +32,7 @@
 
 #include "gtest/gtest.h"
 #include "application_manager/commands/commands_test.h"
-#include "application_manager/commands/hmi/basic_communication_get_system_time_response.h"
+#include "hmi/basic_communication_get_system_time_response.h"
 #include "application_manager/mock_application_manager.h"
 #include "application_manager/mock_event_dispatcher.h"
 #include "application_manager/smart_object_keys.h"
@@ -44,7 +44,7 @@ namespace commands_test {
 namespace hmi_commands_test {
 namespace basic_communication_get_system_time_response {
 
-using application_manager::commands::BasicCommunicationGetSystemTimeResponse;
+using sdl_rpc_plugin::commands::BasicCommunicationGetSystemTimeResponse;
 using test::components::event_engine_test::MockEventDispatcher;
 using testing::ReturnRef;
 
diff --git a/src/components/application_manager/test/commands/hmi/on_system_time_ready_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_system_time_ready_notification_test.cc
index 35750496c8..2d50ec2b72 100644
--- a/src/components/application_manager/test/commands/hmi/on_system_time_ready_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_system_time_ready_notification_test.cc
@@ -32,7 +32,7 @@
 
 #include "gtest/gtest.h"
 #include "application_manager/commands/commands_test.h"
-#include "application_manager/commands/hmi/on_system_time_ready_notification.h"
+#include "hmi/on_system_time_ready_notification.h"
 #include "application_manager/mock_application_manager.h"
 #include "application_manager/mock_event_dispatcher.h"
 #include "application_manager/smart_object_keys.h"
@@ -44,7 +44,7 @@ namespace commands_test {
 namespace hmi_commands_test {
 namespace on_system_time_ready_notification {
 
-using application_manager::commands::OnSystemTimeReadyNotification;
+using sdl_rpc_plugin::commands::OnSystemTimeReadyNotification;
 using test::components::event_engine_test::MockEventDispatcher;
 using testing::ReturnRef;
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc
index 6afdc91165..5835cbff81 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc
@@ -509,7 +509,7 @@ TEST_F(AlertRequestTest, DISABLED_OnEvent_TTSUnsupportedResource_SUCCESS) {
       mock_message_helper_,
       VerifyTtsFiles(
           (*msg_)[am::strings::msg_params][am::strings::tts_chunks], _, _))
-      .WillOnce(Return(mobile_apis::Result::SUCCESS));  
+      .WillOnce(Return(mobile_apis::Result::SUCCESS));
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_Speak)))
@@ -645,7 +645,7 @@ TEST_F(AlertRequestTest, OnEvent_TTSSuccesUiAlertInvalidEnum_SUCCESS) {
           (*msg_)[am::strings::msg_params][am::strings::tts_chunks], _, _))
       .WillOnce(Return(mobile_apis::Result::SUCCESS));
   EXPECT_CALL(
-      mock_rpc_service_,,
+      mock_rpc_service_,
       ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_Speak)))
       .WillOnce(Return(true));
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
index 96264603de..610f923fb8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
@@ -777,6 +777,10 @@ TEST_F(SetGlobalPropertiesRequestTest, Run_TTSHelpAndTimeout_SUCCESS) {
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
   EXPECT_CALL(mock_message_helper_, VerifyImageVrHelpItems(_, _, _)).Times(0);
+  EXPECT_CALL(mock_message_helper_, VerifyTtsFiles(help_prompt, _, _))
+      .WillOnce(Return(mobile_apis::Result::SUCCESS));
+  EXPECT_CALL(mock_message_helper_, VerifyTtsFiles(timeout_prompt, _, _))
+      .WillOnce(Return(mobile_apis::Result::SUCCESS));
   EXPECT_CALL(app_mngr_, RemoveAppFromTTSGlobalPropertiesList(kConnectionKey));
   SmartObject vr_help_title("title");
   EXPECT_CALL(*mock_app_, vr_help_title()).WillOnce(Return(&vr_help_title));
@@ -809,6 +813,8 @@ TEST_F(SetGlobalPropertiesRequestTest, Run_TTSOnlyHelp_SUCCESS) {
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
   EXPECT_CALL(mock_message_helper_, VerifyImageVrHelpItems(_, _, _)).Times(0);
+  EXPECT_CALL(mock_message_helper_, VerifyTtsFiles(help_prompt, _, _))
+      .WillOnce(Return(mobile_apis::Result::SUCCESS));
   EXPECT_CALL(app_mngr_, RemoveAppFromTTSGlobalPropertiesList(kConnectionKey));
   SmartObject vr_help_title("title");
   EXPECT_CALL(*mock_app_, vr_help_title()).WillOnce(Return(&vr_help_title));
@@ -839,6 +845,8 @@ TEST_F(SetGlobalPropertiesRequestTest, Run_TTSOnlyTimeout_SUCCESS) {
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
   EXPECT_CALL(mock_message_helper_, VerifyImageVrHelpItems(_, _, _)).Times(0);
+  EXPECT_CALL(mock_message_helper_, VerifyTtsFiles(timeout_prompt, _, _))
+      .WillOnce(Return(mobile_apis::Result::SUCCESS));
   EXPECT_CALL(app_mngr_, RemoveAppFromTTSGlobalPropertiesList(kConnectionKey));
   SmartObject vr_help_title("title");
   EXPECT_CALL(*mock_app_, vr_help_title()).WillOnce(Return(&vr_help_title));
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
index ee23c8f303..b15b7006e6 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
@@ -49,8 +49,9 @@ class VehicleInfoPlugin : public plugins::RPCPlugin {
             app_mngr::HMICapabilities& hmi_capabilities,
             policy::PolicyHandlerInterface& policy_handler) OVERRIDE;
 
-  bool IsAbleToProcess(const int32_t function_id,
-                       const app_mngr::commands::Command::CommandSource source) OVERRIDE;
+  bool IsAbleToProcess(
+      const int32_t function_id,
+      const app_mngr::commands::Command::CommandSource source) OVERRIDE;
 
   std::string PluginName() OVERRIDE;
   app_mngr::CommandFactory& GetCommandFactory() OVERRIDE;
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 0f44342a02..75ca9e49b0 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -380,7 +380,7 @@ void MessageHelper::SendGetSystemTimeRequest(const uint32_t correlation_id,
   (*message)[strings::params][strings::function_id] =
       hmi_apis::FunctionID::BasicCommunication_GetSystemTime;
 
-  app_mngr.ManageHMICommand(message);
+  app_mngr.GetRPCService().ManageHMICommand(message);
 }
 
 void MessageHelper::SendHashUpdateNotification(const uint32_t app_id,
diff --git a/src/components/application_manager/test/application_helper_test.cc b/src/components/application_manager/test/application_helper_test.cc
index eb1e30c928..c9a8fd2da4 100644
--- a/src/components/application_manager/test/application_helper_test.cc
+++ b/src/components/application_manager/test/application_helper_test.cc
@@ -116,7 +116,6 @@ class ApplicationHelperTest : public testing::Test {
     const connection_handler::DeviceHandle device_id = 1;
     const custom_str::CustomString app_name("");
 
-
     const std::string path_to_plagin = "";
     EXPECT_CALL(mock_application_manager_settings_, plugins_folder())
         .WillOnce(ReturnRef(path_to_plagin));