Fix style issues and build failures outside of tests after merge

3 files changed, 10 insertions, 9 deletions

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 4a590e0d91..e6811e2252 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
@@ -354,7 +354,7 @@ TEST_F(SetGlobalPropertiesRequestTest, OnEvent_SUCCESS_Expect_MessageNotSend) {
 
   MockAppPtr mock_app(CreateMockApp());
   ON_CALL(app_mngr_, application(_)).WillByDefault(Return(mock_app));
-    
+
   EXPECT_CALL(*mock_app, help_prompt_manager())
       .WillOnce(ReturnRef(*mock_help_prompt_manager_.get()));
 
@@ -639,7 +639,8 @@ TEST_F(SetGlobalPropertiesRequestTest, Run_NoVRNoDataNoDefault_Canceled) {
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
   EXPECT_CALL(mock_message_helper_, VerifyImageVrHelpItems(_, _, _)).Times(0);
-  EXPECT_CALL(app_mngr_, RemoveAppFromTTSGlobalPropertiesList(kConnectionKey));  EXPECT_CALL(*mock_app_, set_menu_title(_)).Times(0);
+  EXPECT_CALL(app_mngr_, RemoveAppFromTTSGlobalPropertiesList(kConnectionKey));
+  EXPECT_CALL(*mock_app_, set_menu_title(_)).Times(0);
   EXPECT_CALL(*mock_app_, set_menu_icon(_)).Times(0);
   EXPECT_CALL(*mock_app_, set_keyboard_props(_));
   EXPECT_CALL(*mock_app_, app_id());
diff --git a/src/components/application_manager/src/help_prompt_manager_impl.cc b/src/components/application_manager/src/help_prompt_manager_impl.cc
index dbd3b49a5d..0e1b74f44a 100644
--- a/src/components/application_manager/src/help_prompt_manager_impl.cc
+++ b/src/components/application_manager/src/help_prompt_manager_impl.cc
@@ -261,7 +261,7 @@ void HelpPromptManagerImpl::SendTTSRequest() {
 
     msg_params[strings::app_id] = app_.app_id();
     so_to_send[strings::msg_params] = msg_params;
-    app_manager_.ManageHMICommand(tts_global_properties);
+    app_manager_.GetRPCService().ManageHMICommand(tts_global_properties);
   }
 }
 
@@ -298,7 +298,7 @@ void HelpPromptManagerImpl::SendUIRequest() {
 
     msg_params[strings::app_id] = app_.app_id();
     so_to_send[strings::msg_params] = msg_params;
-    app_manager_.ManageHMICommand(ui_global_properties);
+    app_manager_.GetRPCService().ManageHMICommand(ui_global_properties);
   }
 }
 
diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
index 26a44826be..e2beebc2a0 100644
--- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc
+++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
@@ -557,7 +557,7 @@ TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppInFull) {
 
   application_manager::CommandsMap command;
   DataAccessor<application_manager::CommandsMap> data_accessor(command,
-                                                               app_set_lock_);
+                                                               app_set_lock_ptr_);
 
   EXPECT_CALL(mock_state_controller_, SetRegularState(_, restored_test_type))
       .Times(AtLeast(1));
@@ -606,7 +606,7 @@ TEST_F(ResumeCtrlTest, RestoreAppHMIState_RestoreHMILevelFull) {
 
   ::application_manager::CommandsMap command;
   DataAccessor<application_manager::CommandsMap> data_accessor(command,
-                                                               app_set_lock_);
+                                                               app_set_lock_ptr_);
 
   smart_objects::SmartObject saved_app;
   saved_app[application_manager::strings::hash_id] = kHash_;
@@ -658,7 +658,7 @@ TEST_F(ResumeCtrlTest, ApplicationResumptiOnTimer_AppInFull) {
 
   ::application_manager::CommandsMap command;
   DataAccessor<application_manager::CommandsMap> data_accessor(command,
-                                                               app_set_lock_);
+                                                               app_set_lock_ptr_);
 
   mobile_apis::HMILevel::eType restored_test_type = eType::HMI_FULL;
   const uint32_t ign_off_count = 0u;
@@ -672,9 +672,9 @@ TEST_F(ResumeCtrlTest, ApplicationResumptiOnTimer_AppInFull) {
   EXPECT_CALL(state_controller, SetRegularState(_, restored_test_type))
       .Times(AtLeast(1));
   GetInfoFromApp();
-  EXPECT_CALL(app_mngr_, GetDefaultHmiLevel(const_app_))
+  EXPECT_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
       .WillRepeatedly(Return(kDefaultTestLevel_));
-  EXPECT_CALL(*app_mock_, commands_map()).WillRepeatedly(Return(data_accessor));
+  EXPECT_CALL(*mock_app_, commands_map()).WillRepeatedly(Return(data_accessor));
   ON_CALL(*mock_storage_,
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));