1 files changed, 12 insertions, 15 deletions
diff --git a/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc b/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc
index e4a2d7c340..5225002652 100644
--- a/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_hmi_status_notification.cc
@@ -32,7 +32,7 @@
  */
 
 #include "application_manager/commands/mobile/on_hmi_status_notification.h"
-#include "application_manager/application_manager_impl.h"
+
 #include "application_manager/message_helper.h"
 #include "application_manager/message.h"
 #include "interfaces/MOBILE_API.h"
@@ -41,20 +41,17 @@ namespace application_manager {
 namespace commands {
 
 OnHMIStatusNotification::OnHMIStatusNotification(
-    const MessageSharedPtr& message)
-    : CommandNotificationImpl(message) {
-}
+    const MessageSharedPtr& message, ApplicationManager& application_manager)
+    : CommandNotificationImpl(message, application_manager) {}
 
-OnHMIStatusNotification::~OnHMIStatusNotification() {
-}
+OnHMIStatusNotification::~OnHMIStatusNotification() {}
 
 void OnHMIStatusNotification::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  (*message_)[strings::params][strings::message_type] = static_cast<int32_t> (
-      application_manager::MessageType::kNotification);
-  ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(
-        connection_key());
+  (*message_)[strings::params][strings::message_type] =
+      static_cast<int32_t>(application_manager::MessageType::kNotification);
+  ApplicationSharedPtr app = application_manager_.application(connection_key());
   if (!app.valid()) {
     LOG4CXX_ERROR(logger_, "OnHMIStatusNotification application doesn't exist");
     return;
@@ -67,18 +64,18 @@ void OnHMIStatusNotification::Run() {
       (mobile_apis::HMILevel::HMI_NONE == hmi_level)) {
     if (!(app->tts_properties_in_none())) {
       app->set_tts_properties_in_none(true);
-      LOG4CXX_INFO(logger_, "OnHMIStatusNotification::Send TTS GlobalProperties"
+      LOG4CXX_INFO(logger_,
+                   "OnHMIStatusNotification::Send TTS GlobalProperties"
                    " with empty array to HMI");
-      MessageHelper::SendTTSGlobalProperties(app, false);
+      MessageHelper::SendTTSGlobalProperties(app, false, application_manager_);
     }
   } else if ((mobile_apis::HMILevel::HMI_FULL == hmi_level) ||
-      (mobile_apis::HMILevel::HMI_LIMITED == hmi_level)) {
+             (mobile_apis::HMILevel::HMI_LIMITED == hmi_level)) {
     if (!(app->tts_properties_in_full())) {
       app->set_tts_properties_in_full(true);
       LOG4CXX_INFO(logger_,
                    "OnHMIStatusNotification AddAppToTTSGlobalPropertiesList");
-      ApplicationManagerImpl::instance()->AddAppToTTSGlobalPropertiesList(
-          app->app_id());
+      application_manager_.AddAppToTTSGlobalPropertiesList(app->app_id());
     }
   }
   SendNotification();