fixup! Remove all usage of SubscribedIVI from application manager

2 files changed, 7 insertions, 5 deletions

diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h
index 5859d724ca..d324d5ca24 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h
@@ -40,6 +40,7 @@
 #include "application_manager/commands/command_request_impl.h"
 #include "application_manager/application.h"
 #include "utils/macro.h"
+#include "vehicle_info_plugin/vehicle_info_app_extension.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -158,17 +159,17 @@ class SubscribeVehicleDataRequest
    * @brief VI parameters which had been already subscribed by another apps
    * befor particular app subscribed for these parameters
    */
-  app_mngr::VehicleInfoSubscriptions vi_already_subscribed_by_another_apps_;
+  VehicleInfoSubscriptions vi_already_subscribed_by_another_apps_;
 
   /**
    * @brief VI parameters which had been subscribed already by particular app
    */
-  app_mngr::VehicleInfoSubscriptions vi_already_subscribed_by_this_app_;
+  VehicleInfoSubscriptions vi_already_subscribed_by_this_app_;
 
   /**
    * @brief VI parameters which wait for subscribe after HMI respond
    */
-  app_mngr::VehicleInfoSubscriptions vi_waiting_for_subscribe_;
+  VehicleInfoSubscriptions vi_waiting_for_subscribe_;
 
   DISALLOW_COPY_AND_ASSIGN(SubscribeVehicleDataRequest);
 };
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
index 6a3fb2a0b9..5730048b85 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
@@ -37,6 +37,7 @@
 #include "application_manager/commands/command_request_impl.h"
 #include "application_manager/application.h"
 #include "utils/macro.h"
+#include "vehicle_info_plugin/vehicle_info_app_extension.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -117,12 +118,12 @@ class UnsubscribeVehicleDataRequest
    * @brief VI parameters which still being subscribed by another apps after
    * particular app had been unsubscribed from these parameters
    */
-  app_mngr::VehicleInfoSubscriptions vi_still_subscribed_by_another_apps_;
+  VehicleInfoSubscriptions vi_still_subscribed_by_another_apps_;
 
   /**
    * @brief VI parameters which had been unsubscribed already by particular app
    */
-  app_mngr::VehicleInfoSubscriptions vi_already_unsubscribed_by_this_app_;
+  VehicleInfoSubscriptions vi_already_unsubscribed_by_this_app_;
 
   DISALLOW_COPY_AND_ASSIGN(UnsubscribeVehicleDataRequest);
 };