Remove MediaManger singletone

	+ correctives after LastState, PolicyHandler singletons removing

14 files changed, 143 insertions, 133 deletions

diff --git a/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc b/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc
index 5f656902d9..464ccc4cd2 100644
--- a/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc
+++ b/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc
@@ -39,7 +39,7 @@
 #include "utils/lock.h"
 #include "utils/logger.h"
 #include "connection_handler/connection_handler_impl.h"
-#include "application_manager/application_manager_impl.h"
+#include "protocol_handler/session_observer.h"
 
 namespace media_manager {
 
@@ -70,7 +70,8 @@ class A2DPSourcePlayerAdapter::A2DPSourcePlayerThread
     DISALLOW_COPY_AND_ASSIGN(A2DPSourcePlayerThread);
 };
 
-A2DPSourcePlayerAdapter::A2DPSourcePlayerAdapter() {
+A2DPSourcePlayerAdapter::A2DPSourcePlayerAdapter(protocol_handler::SessionObserver &session_observer)
+    : session_observer_(session_observer) {
 }
 
 A2DPSourcePlayerAdapter::~A2DPSourcePlayerAdapter() {
@@ -96,10 +97,14 @@ void A2DPSourcePlayerAdapter::StartActivity(int32_t application_key) {
         .get_session_observer();
 
     uint32_t device_id = 0;
-    session_observer.GetDataOnSessionKey(application_key, 0, NULL, &device_id);
-
-    std::string mac_address;
-    session_observer.GetDataOnDeviceID(device_id, NULL, NULL, &mac_address);
+    session_observer_.GetDataOnSessionKey(
+        application_key, 0, NULL, &device_id);
+    std::string mac_adddress;
+    session_observer_.GetDataOnDeviceID(
+      device_id,
+      NULL,
+      NULL,
+      &mac_adddress);
 
     // TODO(PK): Convert mac_adddress to the
     // following format : "bluez_source.XX_XX_XX_XX_XX_XX" if needed
diff --git a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
index 050af62ad7..03926395c3 100644
--- a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
+++ b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
@@ -46,7 +46,7 @@
 #include "interfaces/MOBILE_API.h"
 #include "utils/file_system.h"
 #include "utils/logger.h"
-
+#include "media_manager/media_manager_settings.h"
 #include "media_manager/audio/audio_stream_sender_thread.h"
 #include "application_manager/smart_object_keys.h"
 #include "application_manager/message.h"
@@ -59,13 +59,15 @@ const uint32_t kMqueueMessageSize = 4095;
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager")
 
-AudioStreamSenderThread::AudioStreamSenderThread(
-  const std::string fileName, uint32_t session_key)
-  : session_key_(session_key),
-    fileName_(fileName),
-    shouldBeStoped_(false),
-    shouldBeStoped_lock_(),
-    shouldBeStoped_cv_() {
+AudioStreamSenderThread::AudioStreamSenderThread(const std::string fileName,
+    uint32_t session_key,
+    application_manager::ApplicationManager &app_mngr)
+    : session_key_(session_key)
+    , fileName_(fileName)
+    , shouldBeStoped_(false)
+    , shouldBeStoped_lock_()
+    , shouldBeStoped_cv_()
+    , application_manager_(app_mngr) {
   LOG4CXX_AUTO_TRACE(logger_);
 }
 
@@ -114,8 +116,7 @@ void AudioStreamSenderThread::sendAudioChunkToMobile() {
     offset_ = offset_ + to - from;
     std::vector<uint8_t> data(from, to);
 
-    application_manager::ApplicationManagerImpl::instance()->
-    SendAudioPassThroughNotification(session_key_, data);
+    application_manager_.SendAudioPassThroughNotification(session_key_, data);
     binaryData.clear();
   }
 #if !defined(EXTENDED_MEDIA_MODE)
diff --git a/src/components/media_manager/src/audio/file_audio_streamer_adapter.cc b/src/components/media_manager/src/audio/file_audio_streamer_adapter.cc
index 1381a18a01..26c1c2f8e1 100644
--- a/src/components/media_manager/src/audio/file_audio_streamer_adapter.cc
+++ b/src/components/media_manager/src/audio/file_audio_streamer_adapter.cc
@@ -31,12 +31,13 @@
  */
 
 #include "media_manager/audio/file_audio_streamer_adapter.h"
-#include "config_profile/profile.h"
 
 namespace media_manager {
 
-FileAudioStreamerAdapter::FileAudioStreamerAdapter()
-  : FileStreamerAdapter(profile::Profile::instance()->audio_stream_file()) {
+FileAudioStreamerAdapter::FileAudioStreamerAdapter(
+    const std::string& audio_stream_file,
+    const std::string& app_storage_folder)
+  : FileStreamerAdapter(audio_stream_file, app_storage_folder) {
 }
 
 FileAudioStreamerAdapter::~FileAudioStreamerAdapter() {
diff --git a/src/components/media_manager/src/audio/from_mic_recorder_listener.cc b/src/components/media_manager/src/audio/from_mic_recorder_listener.cc
index b8c82e7ab6..8fb359976a 100644
--- a/src/components/media_manager/src/audio/from_mic_recorder_listener.cc
+++ b/src/components/media_manager/src/audio/from_mic_recorder_listener.cc
@@ -39,11 +39,8 @@ namespace media_manager {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager")
 
-FromMicRecorderListener::FromMicRecorderListener(
-  const std::string& file_name)
-  : reader_(NULL)
-  , file_name_(file_name) {
-}
+FromMicRecorderListener::FromMicRecorderListener(const std::string& file_name, application_manager::ApplicationManager &app_mngr)
+    : reader_(NULL), file_name_(file_name), application_manager_(app_mngr) {}
 
 FromMicRecorderListener::~FromMicRecorderListener() {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -72,7 +69,7 @@ void FromMicRecorderListener::OnActivityStarted(int32_t application_key) {
   }
   if (!reader_) {
     AudioStreamSenderThread* thread_delegate =
-      new AudioStreamSenderThread(file_name_, application_key);
+      new AudioStreamSenderThread(file_name_, application_key, application_manager_);
     reader_ = threads::CreateThread("RecorderSender", thread_delegate);
   }
   if (reader_) {
diff --git a/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc b/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc
index fca363cbbf..9791fbd910 100644
--- a/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc
+++ b/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc
@@ -31,12 +31,13 @@
  */
 
 #include "media_manager/audio/pipe_audio_streamer_adapter.h"
-#include "config_profile/profile.h"
 
 namespace media_manager {
 
-PipeAudioStreamerAdapter::PipeAudioStreamerAdapter()
-  : PipeStreamerAdapter(profile::Profile::instance()->named_audio_pipe_path()) {
+PipeAudioStreamerAdapter::PipeAudioStreamerAdapter(
+    const std::string& named_audio_pipe_path,
+    const std::string& app_storage_folder)
+  : PipeStreamerAdapter(named_audio_pipe_path, app_storage_folder) {
 }
 
 PipeAudioStreamerAdapter::~PipeAudioStreamerAdapter() {
diff --git a/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc b/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc
index d7d6be1383..465e0b133e 100644
--- a/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc
+++ b/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc
@@ -31,7 +31,6 @@
  */
 
 #include <string>
-#include "config_profile/profile.h"
 #include "media_manager/audio/socket_audio_streamer_adapter.h"
 
 namespace {
@@ -44,10 +43,9 @@ namespace {
 
 namespace media_manager {
 
-SocketAudioStreamerAdapter::SocketAudioStreamerAdapter()
-  : SocketStreamerAdapter(profile::Profile::instance()->server_address(),
-                          profile::Profile::instance()->audio_streaming_port(),
-                          kHeader) {
+SocketAudioStreamerAdapter::SocketAudioStreamerAdapter(
+    const std::string& server_address, uint16_t audio_streaming_port)
+  : SocketStreamerAdapter(server_address, audio_streaming_port, kHeader) {
 }
 
 SocketAudioStreamerAdapter::~SocketAudioStreamerAdapter() {
diff --git a/src/components/media_manager/src/file_streamer_adapter.cc b/src/components/media_manager/src/file_streamer_adapter.cc
index f2ef72699c..6105fe0356 100644
--- a/src/components/media_manager/src/file_streamer_adapter.cc
+++ b/src/components/media_manager/src/file_streamer_adapter.cc
@@ -32,16 +32,15 @@
 
 #include "utils/logger.h"
 #include "utils/file_system.h"
-#include "config_profile/profile.h"
 #include "media_manager/file_streamer_adapter.h"
 
 namespace media_manager {
 
-CREATE_LOGGERPTR_GLOBAL(logger, "FileStreamerAdapter")
+CREATE_LOGGERPTR_GLOBAL(logger_, "FileStreamerAdapter")
 
 FileStreamerAdapter::FileStreamerAdapter(
-    const std::string& file_name)
-  : StreamerAdapter(new FileStreamer(this, file_name)) {
+    const std::string& file_name, const std::string& app_storage_folder)
+  : StreamerAdapter(new FileStreamer(this, file_name, app_storage_folder)) {
 }
 
 FileStreamerAdapter::~FileStreamerAdapter() {
@@ -49,9 +48,11 @@ FileStreamerAdapter::~FileStreamerAdapter() {
 
 FileStreamerAdapter::FileStreamer::FileStreamer(
     FileStreamerAdapter* const adapter,
-    const std::string& file_name)
+    const std::string& file_name,
+    const std::string& app_storage_folder)
   : Streamer(adapter),
     file_name_(file_name),
+    app_storage_folder_(app_storage_folder),
     file_stream_(NULL) {
 }
 
@@ -59,27 +60,26 @@ FileStreamerAdapter::FileStreamer::~FileStreamer() {
 }
 
 bool FileStreamerAdapter::FileStreamer::Connect() {
-  LOG4CXX_AUTO_TRACE(logger);
-  if (!file_system::CreateDirectoryRecursively(
-      profile::Profile::instance()->app_storage_folder())) {
-    LOG4CXX_ERROR(logger, "Cannot create app folder");
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!file_system::CreateDirectoryRecursively(app_storage_folder_)) {
+    LOG4CXX_ERROR(logger_, "Cannot create app folder");
     return false;
   }
 
   file_stream_ = file_system::Open(file_name_);
   if (!file_stream_) {
-    LOG4CXX_ERROR(logger, "Cannot open file stream "
+    LOG4CXX_ERROR(logger_, "Cannot open file stream "
                   << file_name_);
     return false;
   }
 
-  LOG4CXX_INFO(logger, "File " << file_name_
+  LOG4CXX_INFO(logger_, "File " << file_name_
                 << " was successfuly opened");
   return true;
 }
 
 void FileStreamerAdapter::FileStreamer::Disconnect() {
-  LOG4CXX_AUTO_TRACE(logger);
+  LOG4CXX_AUTO_TRACE(logger_);
   if (file_stream_) {
     file_system::Close(file_stream_);
     delete file_stream_;
@@ -90,21 +90,21 @@ void FileStreamerAdapter::FileStreamer::Disconnect() {
 
 bool FileStreamerAdapter::FileStreamer::Send(
     protocol_handler::RawMessagePtr msg) {
-  LOG4CXX_AUTO_TRACE(logger);
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!file_stream_) {
-    LOG4CXX_ERROR(logger, "File stream not found "
+    LOG4CXX_ERROR(logger_, "File stream not found "
                   << file_name_);
     return false;
   }
 
   if (!file_system::Write(file_stream_, msg->data(),
                           msg->data_size())) {
-    LOG4CXX_ERROR(logger, "Failed writing data to file "
+    LOG4CXX_ERROR(logger_, "Failed writing data to file "
                   << file_name_);
     return false;
   }
 
-  LOG4CXX_INFO(logger, "Streamer::sent " << msg->data_size());
+  LOG4CXX_INFO(logger_, "Streamer::sent " << msg->data_size());
   return true;
 }
 
diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc
index fcbbcce9fa..df4e3d17bb 100644
--- a/src/components/media_manager/src/media_manager_impl.cc
+++ b/src/components/media_manager/src/media_manager_impl.cc
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config_profile/profile.h"
+
 #include "media_manager/media_manager_impl.h"
 #include "media_manager/audio/from_mic_recorder_listener.h"
 #include "media_manager/streamer_listener.h"
@@ -52,17 +52,20 @@
 #include "media_manager/audio/pipe_audio_streamer_adapter.h"
 #include "media_manager/video/file_video_streamer_adapter.h"
 #include "media_manager/audio/file_audio_streamer_adapter.h"
+#include "media_manager/media_manager_settings.h"
 
 namespace media_manager {
 
-using profile::Profile;
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager")
 
-MediaManagerImpl::MediaManagerImpl()
-  : protocol_handler_(NULL)
+MediaManagerImpl::MediaManagerImpl(application_manager::ApplicationManager &application_manager,
+    const MediaManagerSettings& settings)
+  : settings_(settings),
+    protocol_handler_(NULL)
   , a2dp_player_(NULL)
-  , from_mic_recorder_(NULL) {
+  , from_mic_recorder_(NULL),
+    application_manager_(application_manager) {
   Init();
 }
 
@@ -112,28 +115,34 @@ void MediaManagerImpl::Init() {
 
 #if defined(EXTENDED_MEDIA_MODE)
   LOG4CXX_INFO(logger_, "Called Init with default configuration.");
-  a2dp_player_ = new A2DPSourcePlayerAdapter();
+  a2dp_player_ = new A2DPSourcePlayerAdapter(protocol_handler_->get_session_observer());
   from_mic_recorder_ = new FromMicRecorderAdapter();
 #endif
 
-  if ("socket" == profile::Profile::instance()->video_server_type()) {
-    streamer_[ServiceType::kMobileNav] = new SocketVideoStreamerAdapter();
-  } else if ("pipe" == profile::Profile::instance()->video_server_type()) {
-    streamer_[ServiceType::kMobileNav] = new PipeVideoStreamerAdapter();
-  } else if ("file" == profile::Profile::instance()->video_server_type()) {
-    streamer_[ServiceType::kMobileNav] = new FileVideoStreamerAdapter();
+  if ("socket" == settings().video_server_type()) {
+    streamer_[ServiceType::kMobileNav] = new SocketVideoStreamerAdapter(
+        settings().server_address(), settings().video_streaming_port());
+  } else if ("pipe" == settings().video_server_type()) {
+    streamer_[ServiceType::kMobileNav]= new PipeVideoStreamerAdapter(
+        settings().named_video_pipe_path(), settings().app_storage_folder());
+  } else if ("file" == settings().video_server_type()) {
+    streamer_[ServiceType::kMobileNav] = new FileVideoStreamerAdapter(
+        settings().video_stream_file(), settings().app_storage_folder());
   }
 
-  if ("socket" == profile::Profile::instance()->audio_server_type()) {
-    streamer_[ServiceType::kAudio] = new SocketAudioStreamerAdapter();
-  } else if ("pipe" == profile::Profile::instance()->audio_server_type()) {
-    streamer_[ServiceType::kAudio] = new PipeAudioStreamerAdapter();
-  } else if ("file" == profile::Profile::instance()->audio_server_type()) {
-    streamer_[ServiceType::kAudio] = new FileAudioStreamerAdapter();
+  if ("socket" == settings().audio_server_type()) {
+    streamer_[ServiceType::kAudio] = new SocketAudioStreamerAdapter(
+        settings().server_address(), settings().audio_streaming_port());
+  } else if ("pipe" == settings().audio_server_type()) {
+    streamer_[ServiceType::kAudio] = new PipeAudioStreamerAdapter(
+        settings().named_audio_pipe_path(), settings().app_storage_folder());
+  } else if ("file" == settings().audio_server_type()) {
+    streamer_[ServiceType::kAudio] = new FileAudioStreamerAdapter(
+        settings().audio_stream_file(), settings().app_storage_folder());
   }
 
-  streamer_listener_[ServiceType::kMobileNav] = new StreamerListener();
-  streamer_listener_[ServiceType::kAudio] = new StreamerListener();
+  streamer_listener_[ServiceType::kMobileNav] = new StreamerListener(*this);
+  streamer_listener_[ServiceType::kAudio] = new StreamerListener(*this);
 
   if (streamer_[ServiceType::kMobileNav]) {
     streamer_[ServiceType::kMobileNav]->AddListener(
@@ -167,14 +176,14 @@ void MediaManagerImpl::StartMicrophoneRecording(
   LOG4CXX_INFO(logger_, "MediaManagerImpl::StartMicrophoneRecording to "
                << output_file);
   application_manager::ApplicationSharedPtr app =
-    application_manager::ApplicationManagerImpl::instance()->
-      application(application_key);
+      application_manager_.application(application_key);
   std::string file_path =
-  profile::Profile::instance()->app_storage_folder();
+  settings().app_storage_folder();
   file_path += "/";
   file_path += output_file;
-  from_mic_listener_ = new FromMicRecorderListener(file_path);
-#if defined(EXTENDED_MEDIA_MODE)
+  from_mic_listener_ = new FromMicRecorderListener(file_path,
+                                                   application_manager_);
+#ifdef EXTENDED_MEDIA_MODE
   if (from_mic_recorder_) {
     from_mic_recorder_->AddListener(from_mic_listener_);
     (static_cast<FromMicRecorderAdapter*>(from_mic_recorder_))
@@ -194,8 +203,8 @@ void MediaManagerImpl::StartMicrophoneRecording(
     }
   }
   const std::string record_file_source =
-      profile::Profile::instance()->app_resourse_folder() + "/" +
-      profile::Profile::instance()->recording_file_source();
+      settings().app_resource_folder() + "/" +
+      settings().recording_file_source();
   std::vector<uint8_t> buf;
   if (file_system::ReadBinaryFile(record_file_source, buf)) {
     if (file_system::Write(file_path, buf)) {
@@ -269,16 +278,13 @@ void MediaManagerImpl::OnMessageReceived(
     return;
   }
 
-  ApplicationManagerImpl* app_mgr = ApplicationManagerImpl::instance();
-  DCHECK_OR_RETURN_VOID(app_mgr);
-
-  if (!app_mgr->CanAppStream(streaming_app_id, service_type)) {
-    app_mgr->ForbidStreaming(streaming_app_id);
+  if (!application_manager_.CanAppStream(streaming_app_id, service_type)) {
+    application_manager_.ForbidStreaming(streaming_app_id);
     LOG4CXX_ERROR(logger_, "The application trying to stream when it should not.");
     return;
   }
 
-  ApplicationSharedPtr app = app_mgr->application(streaming_app_id);
+  ApplicationSharedPtr app = application_manager_.application(streaming_app_id);
   if (app) {
     app->WakeUpStreaming(service_type);
     streamer_[service_type]->SendData(streaming_app_id, message);
@@ -297,4 +303,8 @@ void MediaManagerImpl::FramesProcessed(int32_t application_key,
   }
 }
 
+const MediaManagerSettings& MediaManagerImpl::settings() const {
+  return settings_;
+}
+
 }  //  namespace media_manager
diff --git a/src/components/media_manager/src/pipe_streamer_adapter.cc b/src/components/media_manager/src/pipe_streamer_adapter.cc
index a61280f057..07ca407386 100644
--- a/src/components/media_manager/src/pipe_streamer_adapter.cc
+++ b/src/components/media_manager/src/pipe_streamer_adapter.cc
@@ -36,16 +36,15 @@
 #include <unistd.h>
 #include "utils/logger.h"
 #include "utils/file_system.h"
-#include "config_profile/profile.h"
 #include "media_manager/pipe_streamer_adapter.h"
 
 namespace media_manager {
 
-CREATE_LOGGERPTR_GLOBAL(logger, "PipeStreamerAdapter")
+CREATE_LOGGERPTR_GLOBAL(logger_, "PipeStreamerAdapter")
 
 PipeStreamerAdapter::PipeStreamerAdapter(
-    const std::string& named_pipe_path)
-  : StreamerAdapter(new PipeStreamer(this, named_pipe_path)) {
+    const std::string& named_pipe_path, const std::string& app_storage_folder)
+  : StreamerAdapter(new PipeStreamer(this, named_pipe_path, app_storage_folder)) {
 }
 
 PipeStreamerAdapter::~PipeStreamerAdapter() {
@@ -53,75 +52,75 @@ PipeStreamerAdapter::~PipeStreamerAdapter() {
 
 PipeStreamerAdapter::PipeStreamer::PipeStreamer(
     PipeStreamerAdapter* const adapter,
-    const std::string& named_pipe_path)
+    const std::string& named_pipe_path,
+    const std::string& app_storage_folder)
   : Streamer(adapter),
     named_pipe_path_(named_pipe_path),
+    app_storage_folder_(app_storage_folder),
     pipe_fd_(0) {
-  if (!file_system::CreateDirectoryRecursively(
-      profile::Profile::instance()->app_storage_folder())) {
-    LOG4CXX_ERROR(logger, "Cannot create app storage folder "
-                  << profile::Profile::instance()->app_storage_folder() );
-    return;
-  }
-
-  if ((mkfifo(named_pipe_path_.c_str(),
-              S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) < 0)
-      && (errno != EEXIST)) {
-    LOG4CXX_ERROR(logger, "Cannot create pipe " << named_pipe_path_);
-  } else {
-    LOG4CXX_INFO(logger, "Pipe " << named_pipe_path_
-                 << " was successfuly created");
-  }
+    if (!file_system::CreateDirectoryRecursively(app_storage_folder_)) {
+      LOG4CXX_ERROR(logger_, "Cannot create app storage folder "
+                    << app_storage_folder_ );
+      return;
+    }
+    if ((mkfifo(named_pipe_path_.c_str(),
+                S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) < 0)
+        && (errno != EEXIST)) {
+      LOG4CXX_ERROR(logger_, "Cannot create pipe " << named_pipe_path_);
+    } else {
+      LOG4CXX_INFO(logger_, "Pipe " << named_pipe_path_
+                   << " was successfully created");
+    }
 }
-
 PipeStreamerAdapter::PipeStreamer::~PipeStreamer() {
   if (0 == unlink(named_pipe_path_.c_str()) ) {
-    LOG4CXX_INFO(logger, "Pipe " << named_pipe_path_ << " was removed");
+    LOG4CXX_INFO(logger_, "Pipe " << named_pipe_path_ << " was removed");
   } else {
-    LOG4CXX_ERROR(logger, "Error removing pipe " << named_pipe_path_);
+    LOG4CXX_ERROR(logger_, "Error removing pipe " << named_pipe_path_);
   }
 }
 
+
 bool PipeStreamerAdapter::PipeStreamer::Connect() {
-  LOG4CXX_AUTO_TRACE(logger);
+  LOG4CXX_AUTO_TRACE(logger_);
 
   pipe_fd_ = open(named_pipe_path_.c_str(), O_RDWR, 0);
   if (-1 == pipe_fd_) {
-    LOG4CXX_ERROR(logger, "Cannot open pipe for writing "
+    LOG4CXX_ERROR(logger_, "Cannot open pipe for writing "
                   << named_pipe_path_);
     return false;
   }
 
-  LOG4CXX_INFO(logger, "Pipe " << named_pipe_path_
+  LOG4CXX_INFO(logger_, "Pipe " << named_pipe_path_
                 << " was successfuly opened for writing");
   return true;
 }
 
 void PipeStreamerAdapter::PipeStreamer::Disconnect() {
-  LOG4CXX_AUTO_TRACE(logger);
+  LOG4CXX_AUTO_TRACE(logger_);
   if (0 == close(pipe_fd_)) {
-    LOG4CXX_INFO(logger, "Pipe " << named_pipe_path_ << " was closed");
+    LOG4CXX_INFO(logger_, "Pipe " << named_pipe_path_ << " was closed");
   } else {
-    LOG4CXX_ERROR(logger, "Error closing pipe " << named_pipe_path_);
+    LOG4CXX_ERROR(logger_, "Error closing pipe " << named_pipe_path_);
   }
 }
 
 bool PipeStreamerAdapter::PipeStreamer::Send(
     protocol_handler::RawMessagePtr msg) {
-  LOG4CXX_AUTO_TRACE(logger);
+  LOG4CXX_AUTO_TRACE(logger_);
   ssize_t ret = write(pipe_fd_, msg->data(), msg->data_size());
   if (-1 == ret) {
-    LOG4CXX_ERROR(logger, "Failed writing data to pipe "
+    LOG4CXX_ERROR(logger_, "Failed writing data to pipe "
                   << named_pipe_path_);
     return false;
   }
 
   if (static_cast<uint32_t>(ret) != msg->data_size()) {
-    LOG4CXX_WARN(logger, "Couldn't write all the data to pipe "
+    LOG4CXX_WARN(logger_, "Couldn't write all the data to pipe "
                  << named_pipe_path_);
   }
 
-  LOG4CXX_INFO(logger, "Streamer::sent " << msg->data_size());
+  LOG4CXX_INFO(logger_, "Streamer::sent " << msg->data_size());
   return true;
 }
 
diff --git a/src/components/media_manager/src/socket_streamer_adapter.cc b/src/components/media_manager/src/socket_streamer_adapter.cc
index ecf6535958..1670e7e549 100644
--- a/src/components/media_manager/src/socket_streamer_adapter.cc
+++ b/src/components/media_manager/src/socket_streamer_adapter.cc
@@ -46,7 +46,7 @@ CREATE_LOGGERPTR_GLOBAL(logger, "SocketStreamerAdapter")
 
 SocketStreamerAdapter::SocketStreamerAdapter(
     const std::string& ip,
-    int32_t port,
+    uint16_t port,
     const std::string& header)
   : StreamerAdapter(new SocketStreamer(this, ip, port, header)) {
 }
@@ -57,7 +57,7 @@ SocketStreamerAdapter::~SocketStreamerAdapter() {
 SocketStreamerAdapter::SocketStreamer::SocketStreamer(
     SocketStreamerAdapter* const adapter,
     const std::string& ip,
-    int32_t port,
+    uint16_t port,
     const std::string& header)
   : Streamer(adapter),
     ip_(ip),
diff --git a/src/components/media_manager/src/streamer_listener.cc b/src/components/media_manager/src/streamer_listener.cc
index 3ad55c1265..97f3c5300f 100644
--- a/src/components/media_manager/src/streamer_listener.cc
+++ b/src/components/media_manager/src/streamer_listener.cc
@@ -38,8 +38,9 @@ namespace media_manager {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager")
 
-StreamerListener::StreamerListener()
-  : current_application_(0) {
+StreamerListener::StreamerListener(MediaManager& media_manager)
+  : current_application_(0),
+    media_manager_(media_manager) {
 }
 
 StreamerListener::~StreamerListener() {
@@ -49,7 +50,7 @@ StreamerListener::~StreamerListener() {
 void StreamerListener::OnDataReceived(
   int32_t application_key,
   const DataForListener& data) {
-  MediaManagerImpl::instance()->FramesProcessed(application_key, data);
+  media_manager_.FramesProcessed(application_key, data);
 }
 
 void StreamerListener::OnErrorReceived(
diff --git a/src/components/media_manager/src/video/file_video_streamer_adapter.cc b/src/components/media_manager/src/video/file_video_streamer_adapter.cc
index 07bcadcd94..8674a406fb 100644
--- a/src/components/media_manager/src/video/file_video_streamer_adapter.cc
+++ b/src/components/media_manager/src/video/file_video_streamer_adapter.cc
@@ -31,12 +31,13 @@
  */
 
 #include "media_manager/video/file_video_streamer_adapter.h"
-#include "config_profile/profile.h"
 
 namespace media_manager {
 
-FileVideoStreamerAdapter::FileVideoStreamerAdapter()
-  : FileStreamerAdapter(profile::Profile::instance()->video_stream_file()) {
+FileVideoStreamerAdapter::FileVideoStreamerAdapter(
+    const std::string& video_stream_file,
+    const std::string& app_storage_folder)
+  : FileStreamerAdapter(video_stream_file, app_storage_folder) {
 }
 
 FileVideoStreamerAdapter::~FileVideoStreamerAdapter() {
diff --git a/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc b/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc
index 9fb66dc465..0ced20f9e9 100644
--- a/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc
+++ b/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc
@@ -31,12 +31,13 @@
  */
 
 #include "media_manager/video/pipe_video_streamer_adapter.h"
-#include "config_profile/profile.h"
 
 namespace media_manager {
 
-PipeVideoStreamerAdapter::PipeVideoStreamerAdapter()
-  : PipeStreamerAdapter(profile::Profile::instance()->named_video_pipe_path()) {
+PipeVideoStreamerAdapter::PipeVideoStreamerAdapter(
+    const std::string& named_video_pipe_path,
+    const std::string& app_storage_folder)
+  : PipeStreamerAdapter(named_video_pipe_path, app_storage_folder) {
 }
 
 PipeVideoStreamerAdapter::~PipeVideoStreamerAdapter() {
diff --git a/src/components/media_manager/src/video/socket_video_streamer_adapter.cc b/src/components/media_manager/src/video/socket_video_streamer_adapter.cc
index 9da1159feb..a6cf14e032 100644
--- a/src/components/media_manager/src/video/socket_video_streamer_adapter.cc
+++ b/src/components/media_manager/src/video/socket_video_streamer_adapter.cc
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <string>
-#include "config_profile/profile.h"
 #include "media_manager/video/socket_video_streamer_adapter.h"
 
 namespace {
@@ -44,11 +42,8 @@ namespace {
 
 namespace media_manager {
 
-SocketVideoStreamerAdapter::SocketVideoStreamerAdapter()
-  : SocketStreamerAdapter(profile::Profile::instance()->server_address(),
-                          profile::Profile::instance()->video_streaming_port(),
-                          kHeader) {
-}
+SocketVideoStreamerAdapter::SocketVideoStreamerAdapter(const std::string& server_address, uint16_t video_streaming_port)
+    : SocketStreamerAdapter(server_address, video_streaming_port, kHeader) {}
 
 SocketVideoStreamerAdapter::~SocketVideoStreamerAdapter() {
 }