2 files changed, 10 insertions, 1 deletions
diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h
index e74d2569ab..da227c7b60 100644
--- a/src/components/include/test/application_manager/mock_application_manager.h
+++ b/src/components/include/test/application_manager/mock_application_manager.h
@@ -51,6 +51,8 @@
 #include "application_manager/event_engine/event_dispatcher.h"
 #include "application_manager/state_controller.h"
 #include "smart_objects/smart_object.h"
+#include "application_manager/plugin_manager/rpc_plugin_manager.h"
+#include "application_manager/command_factory.h"
 
 namespace test {
 namespace components {
@@ -82,7 +84,8 @@ class MockApplicationManager : public application_manager::ApplicationManager {
                          const std::string& policy_app_id));
   MOCK_METHOD2(ChangeAppsHMILevel,
                void(uint32_t app_id, mobile_apis::HMILevel::eType level));
-  MOCK_METHOD0(GetPluginManager, plugin_manager::RPCPluginManager&());
+  MOCK_METHOD0(GetPluginManager,
+               application_manager::plugin_manager::RPCPluginManager&());
   MOCK_CONST_METHOD1(
       devices, std::vector<std::string>(const std::string& policy_app_id));
 #endif  // SDL_REMOTE_CONTROL
@@ -311,6 +314,8 @@ class MockApplicationManager : public application_manager::ApplicationManager {
                     const uint32_t connection_key));
   MOCK_CONST_METHOD1(IsAppInReconnectMode,
                      bool(const std::string& policy_app_id));
+  MOCK_CONST_METHOD0(GetCommandFactory, application_manager::CommandFactory&());
+  MOCK_CONST_METHOD0(is_audio_pass_thru_active, bool());
 };
 
 }  // namespace application_manager_test
diff --git a/src/components/include/test/application_manager/mock_rpc_service.h b/src/components/include/test/application_manager/mock_rpc_service.h
index 983e969b0a..360faae3ec 100644
--- a/src/components/include/test/application_manager/mock_rpc_service.h
+++ b/src/components/include/test/application_manager/mock_rpc_service.h
@@ -27,6 +27,10 @@ class MockRPCService : public application_manager::rpc_service::RPCService {
                void(const application_manager::MessagePtr& message));
   MOCK_METHOD1(SendPostMessageToHMI,
                void(const application_manager::MessagePtr& message));
+  MOCK_METHOD1(set_protocol_handler,
+               void(protocol_handler::ProtocolHandler* handler));
+  MOCK_METHOD1(set_hmi_message_handler,
+               void(hmi_message_handler::HMIMessageHandler* handler));
 #endif  // SDL_REMOTE_CONTROL
 };
 }