move commands factory to rpc plugin

Replace include path of the commands

Fix some things

Fixing compile of applicaiton manager

Move Commands interface part back to application_manager
Use unique ptr for plugin manager
Fix style in RPC services and factories
Remove redunsant includes of factories in application manager
Remove include of functional module

1 files changed, 12 insertions, 3 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
index ec3649d6f7..56573633ca 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
@@ -1,24 +1,33 @@
 #ifndef SDL_RPC_PLUGIN_H
 #define SDL_RPC_PLUGIN_H
 #include "application_manager/plugin_manager/rpc_plugin.h"
+#include "application_manager/command_factory.h"
+
 namespace sdl_rpc_plugin {
 namespace plugins = application_manager::plugin_manager;
 class SDLRPCPlugin : public plugins::RPCPlugin {
   // RPCPlugin interface
  public:
-  bool Init() OVERRIDE;
+  bool Init(application_manager::ApplicationManager& app_manager,
+            application_manager::rpc_service::RPCService& rpc_service,
+            application_manager::HMICapabilities& hmi_capabilities,
+            policy::PolicyHandlerInterface& policy_handler) OVERRIDE;
+
   bool IsAbleToProcess(
       const int32_t function_id,
       const application_manager::commands::Command::CommandSource
           message_source) OVERRIDE;
   std::string PluginName() OVERRIDE;
-  application_manager::plugin_manager::CommandFactory& GetCommandFactory()
-      override;
+
+  application_manager::CommandFactory& GetCommandFactory() OVERRIDE;
   void OnPolicyEvent(
       application_manager::plugin_manager::PolicyEvent event) OVERRIDE;
   void OnApplicationEvent(
       application_manager::plugin_manager::ApplicationEvent event,
       application_manager::ApplicationSharedPtr application) OVERRIDE;
+
+ private:
+  std::unique_ptr<application_manager::CommandFactory> command_factory_;
 };
 }