Format all code in project

        Formated all code in appMain, components, plugins to correct coding-style
	Used clang-format-3.6

        Used 2 commands :
                find src/appMain/ -name "*.h" -o  -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
                find src/components/ -name "*.h" -o  -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
		find src/plugins/ -name "*.h" -o  -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file

20 files changed, 222 insertions, 237 deletions

diff --git a/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h b/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h
index 09985282d1..3f262b27bb 100644
--- a/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h
+++ b/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h
@@ -39,7 +39,7 @@
 #include "utils/threads/thread_delegate.h"
 
 namespace protocol_handler {
-  class SessionObserver;
+class SessionObserver;
 }
 
 namespace threads {
@@ -49,28 +49,28 @@ class Thread;
 namespace media_manager {
 
 class A2DPSourcePlayerAdapter : public MediaAdapterImpl {
-  public:
-    A2DPSourcePlayerAdapter(protocol_handler::SessionObserver& session_observer);
-    ~A2DPSourcePlayerAdapter();
-    void SendData(int32_t application_key,
-                  const ::protocol_handler::RawMessagePtr message) {}
-    void StartActivity(int32_t application_key);
-    void StopActivity(int32_t application_key);
-    bool is_app_performing_activity(int32_t application_key) const;
+ public:
+  A2DPSourcePlayerAdapter(protocol_handler::SessionObserver& session_observer);
+  ~A2DPSourcePlayerAdapter();
+  void SendData(int32_t application_key,
+                const ::protocol_handler::RawMessagePtr message) {}
+  void StartActivity(int32_t application_key);
+  void StopActivity(int32_t application_key);
+  bool is_app_performing_activity(int32_t application_key) const;
 
-    void set_connection_handler(
-        connection_handler::ConnectionHandlerImpl* connection_handler) {
-      connection_handler_ = connection_handler;
-    }
+  void set_connection_handler(
+      connection_handler::ConnectionHandlerImpl* connection_handler) {
+    connection_handler_ = connection_handler;
+  }
 
-  private:
-    class A2DPSourcePlayerThread;
+ private:
+  class A2DPSourcePlayerThread;
 
-    typedef std::pair<threads::Thread*, A2DPSourcePlayerThread*> Pair;
-    typedef std::map<int32_t, Pair> SourcesMap;
-    SourcesMap sources_;
-    protocol_handler::SessionObserver& session_observer_;
-    DISALLOW_COPY_AND_ASSIGN(A2DPSourcePlayerAdapter);
+  typedef std::pair<threads::Thread*, A2DPSourcePlayerThread*> Pair;
+  typedef std::map<int32_t, Pair> SourcesMap;
+  SourcesMap sources_;
+  protocol_handler::SessionObserver& session_observer_;
+  DISALLOW_COPY_AND_ASSIGN(A2DPSourcePlayerAdapter);
 };
 
 }  // namespace media_manager
diff --git a/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h b/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h
index e9de397eed..b956f2c9e2 100644
--- a/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h
+++ b/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h
@@ -39,7 +39,6 @@
 #include "utils/conditional_variable.h"
 #include "utils/lock.h"
 
-
 namespace NsSmartDeviceLink {
 namespace NsSmartObjects {
 class SmartObject;
@@ -47,7 +46,7 @@ class SmartObject;
 }
 
 namespace application_manager {
-  class ApplicationManager;
+class ApplicationManager;
 }
 
 namespace media_manager {
@@ -66,71 +65,67 @@ typedef enum {
   ACQ_16_BIT = 1
 } AudioCaptureQuality;
 
-typedef enum {
-  AT_INVALID = -1,
-  AT_PCM = 0
-} AudioType;
+typedef enum { AT_INVALID = -1, AT_PCM = 0 } AudioType;
 
 /*
- * @brief AudioStreamSenderThread class used to read binary data written from microphone
+ * @brief AudioStreamSenderThread class used to read binary data written from
+ * microphone
  * and send it every 1 second to mobile device.
  */
 class AudioStreamSenderThread : public threads::ThreadDelegate {
-  public:
-    /*
-     * @brief AudioStreamSenderThread class constructor
-     *
-     * @param session_key     Session key of connection for Mobile side
-     * @param correlation_id  Correlation id for response for Mobile side
-     */
-    AudioStreamSenderThread(const std::string& fileName,
-                            uint32_t session_key,
-                            application_manager::ApplicationManager& app_mngr);
-
-    /*
-     * @brief AudioStreamSenderThread class destructor
-     */
-    ~AudioStreamSenderThread();
-
-    /**
-     * @brief Thread procedure.
-     */
-    void threadMain();
-
-    /*
-     * @brief Retrieve session key
-     *
-     * @return Stored session key
-     */
-    uint32_t session_key() const;
-
-    void exitThreadMain();
-
-  private:
-    /*
-     * @brief Sends AudioPassThru request
-     */
-    bool SendEndAudioPassThru();
-
-    void sendAudioChunkToMobile();
-
-
-    bool getShouldBeStopped();
-    void setShouldBeStopped(bool should_stop);
-
-    uint32_t                              session_key_;
-    const std::string                     fileName_;
-    int32_t                               offset_;
-    volatile bool                         shouldBeStoped_;
-    sync_primitives::Lock                 shouldBeStoped_lock_;
-    sync_primitives::ConditionalVariable  shouldBeStoped_cv_;
-
-    static const int32_t                  kAudioPassThruTimeout;
-
-    application_manager::ApplicationManager& application_manager_;
-
-
-    DISALLOW_COPY_AND_ASSIGN(AudioStreamSenderThread);
+ public:
+  /*
+   * @brief AudioStreamSenderThread class constructor
+   *
+   * @param session_key     Session key of connection for Mobile side
+   * @param correlation_id  Correlation id for response for Mobile side
+   */
+  AudioStreamSenderThread(const std::string& fileName,
+                          uint32_t session_key,
+                          application_manager::ApplicationManager& app_mngr);
+
+  /*
+   * @brief AudioStreamSenderThread class destructor
+   */
+  ~AudioStreamSenderThread();
+
+  /**
+   * @brief Thread procedure.
+   */
+  void threadMain();
+
+  /*
+   * @brief Retrieve session key
+   *
+   * @return Stored session key
+   */
+  uint32_t session_key() const;
+
+  void exitThreadMain();
+
+ private:
+  /*
+   * @brief Sends AudioPassThru request
+   */
+  bool SendEndAudioPassThru();
+
+  void sendAudioChunkToMobile();
+
+  bool getShouldBeStopped();
+  void setShouldBeStopped(bool should_stop);
+
+  uint32_t session_key_;
+  const std::string fileName_;
+  int32_t offset_;
+  volatile bool shouldBeStoped_;
+  sync_primitives::Lock shouldBeStoped_lock_;
+  sync_primitives::ConditionalVariable shouldBeStoped_cv_;
+
+  static const int32_t kAudioPassThruTimeout;
+
+  application_manager::ApplicationManager& application_manager_;
+
+  DISALLOW_COPY_AND_ASSIGN(AudioStreamSenderThread);
 };
 }  // namespace media_manager
 
diff --git a/src/components/media_manager/include/media_manager/audio/file_audio_streamer_adapter.h b/src/components/media_manager/include/media_manager/audio/file_audio_streamer_adapter.h
index f51aed0a47..dc0c001acf 100644
--- a/src/components/media_manager/include/media_manager/audio/file_audio_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/audio/file_audio_streamer_adapter.h
@@ -39,9 +39,8 @@ namespace media_manager {
 
 class FileAudioStreamerAdapter : public FileStreamerAdapter {
  public:
-  FileAudioStreamerAdapter(
-      const std::string& audio_stream_file,
-      const std::string& app_storage_folder);
+  FileAudioStreamerAdapter(const std::string& audio_stream_file,
+                           const std::string& app_storage_folder);
   ~FileAudioStreamerAdapter();
 };
 
diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
index a3c4061162..7daf9c7add 100644
--- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
+++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
@@ -43,22 +43,23 @@ class Thread;
 namespace media_manager {
 
 class FromMicRecorderAdapter : public MediaAdapterImpl {
-  public:
-    FromMicRecorderAdapter();
-    ~FromMicRecorderAdapter();
-    void SendData(int32_t application_key,
-                  const ::protocol_handler::RawMessagePtr message) {}
-    void StartActivity(int32_t application_key);
-    void StopActivity(int32_t application_key);
-    bool is_app_performing_activity(int32_t application_key) const;
-    void set_output_file(const std::string& output_file);
-    void set_duration(int32_t duration);
-  private:
-    threads::Thread* recorder_thread_;
-    std::string output_file_;
-    const int32_t kDefaultDuration;
-    int32_t duration_;
-    DISALLOW_COPY_AND_ASSIGN(FromMicRecorderAdapter);
+ public:
+  FromMicRecorderAdapter();
+  ~FromMicRecorderAdapter();
+  void SendData(int32_t application_key,
+                const ::protocol_handler::RawMessagePtr message) {}
+  void StartActivity(int32_t application_key);
+  void StopActivity(int32_t application_key);
+  bool is_app_performing_activity(int32_t application_key) const;
+  void set_output_file(const std::string& output_file);
+  void set_duration(int32_t duration);
+
+ private:
+  threads::Thread* recorder_thread_;
+  std::string output_file_;
+  const int32_t kDefaultDuration;
+  int32_t duration_;
+  DISALLOW_COPY_AND_ASSIGN(FromMicRecorderAdapter);
 };
 }  // namespace media_manager
 
diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h
index 96eb32b400..c615195f94 100644
--- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h
+++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h
@@ -37,7 +37,7 @@
 #include "media_manager/media_adapter_listener.h"
 
 namespace application_manager {
-  class ApplicationManager;
+class ApplicationManager;
 }
 
 namespace threads {
@@ -46,25 +46,23 @@ class Thread;
 
 namespace media_manager {
 class FromMicRecorderListener : public MediaAdapterListener {
-  public:
-    FromMicRecorderListener(const std::string& file_name,
-      application_manager::ApplicationManager &);
-    ~FromMicRecorderListener();
-    virtual void OnDataReceived(
-      int32_t application_key,
-      const DataForListener& data);
-    virtual void OnErrorReceived(
-      int32_t application_key,
-      const DataForListener& data);
-    virtual void OnActivityStarted(int32_t application_key);
-    virtual void OnActivityEnded(int32_t application_key);
+ public:
+  FromMicRecorderListener(const std::string& file_name,
+                          application_manager::ApplicationManager&);
+  ~FromMicRecorderListener();
+  virtual void OnDataReceived(int32_t application_key,
+                              const DataForListener& data);
+  virtual void OnErrorReceived(int32_t application_key,
+                               const DataForListener& data);
+  virtual void OnActivityStarted(int32_t application_key);
+  virtual void OnActivityEnded(int32_t application_key);
 
-  private:
-    threads::Thread* reader_;
-    std::string file_name_;
-    int32_t current_application_;
-    application_manager::ApplicationManager& application_manager_;
-    DISALLOW_COPY_AND_ASSIGN(FromMicRecorderListener);
+ private:
+  threads::Thread* reader_;
+  std::string file_name_;
+  int32_t current_application_;
+  application_manager::ApplicationManager& application_manager_;
+  DISALLOW_COPY_AND_ASSIGN(FromMicRecorderListener);
 };
 }  //  namespace media_manager
 
diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h b/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h
index 7bb036fa42..f0c6d3c48f 100644
--- a/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h
+++ b/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h
@@ -44,53 +44,52 @@
 namespace media_manager {
 
 class FromMicToFileRecorderThread : public threads::ThreadDelegate {
-  public:
-    FromMicToFileRecorderThread(const std::string& output_file,
-                                int32_t duration);
-    ~FromMicToFileRecorderThread();
-    void threadMain();
+ public:
+  FromMicToFileRecorderThread(const std::string& output_file, int32_t duration);
+  ~FromMicToFileRecorderThread();
+  void threadMain();
 
-    void exitThreadMain();
+  void exitThreadMain();
 
-    void set_output_file(const std::string& output_file);
-    void set_record_duration(int32_t duration);
+  void set_output_file(const std::string& output_file);
+  void set_record_duration(int32_t duration);
 
-  private:
-    int32_t argc_;
-    gchar** argv_;
+ private:
+  int32_t argc_;
+  gchar** argv_;
 
-    const std::string oKey_;
-    const std::string tKey_;
+  const std::string oKey_;
+  const std::string tKey_;
 
-    static GMainLoop* loop;
-    threads::Thread* sleepThread_;
-    bool shouldBeStoped_;
-    sync_primitives::Lock stopFlagLock_;
+  static GMainLoop* loop;
+  threads::Thread* sleepThread_;
+  bool shouldBeStoped_;
+  sync_primitives::Lock stopFlagLock_;
 
-    std::string outputFileName_, durationString_;
+  std::string outputFileName_, durationString_;
 
-    typedef struct {
-      GstElement* pipeline;
-      gint duration;
-    } GstTimeout;
+  typedef struct {
+    GstElement* pipeline;
+    gint duration;
+  } GstTimeout;
 
-    void initArgs();
+  void initArgs();
 
-    void psleep(void* timeout);
+  void psleep(void* timeout);
 
-    class SleepThreadDelegate : public threads::ThreadDelegate {
-      public:
-        explicit SleepThreadDelegate(GstTimeout timeout);
+  class SleepThreadDelegate : public threads::ThreadDelegate {
+   public:
+    explicit SleepThreadDelegate(GstTimeout timeout);
 
-        void threadMain();
+    void threadMain();
 
-      private:
-        GstTimeout timeout_;
+   private:
+    GstTimeout timeout_;
 
-        DISALLOW_COPY_AND_ASSIGN(SleepThreadDelegate);
-    };
+    DISALLOW_COPY_AND_ASSIGN(SleepThreadDelegate);
+  };
 
-    DISALLOW_COPY_AND_ASSIGN(FromMicToFileRecorderThread);
+  DISALLOW_COPY_AND_ASSIGN(FromMicToFileRecorderThread);
 };
 
 }  // namespace media_manager
diff --git a/src/components/media_manager/include/media_manager/audio/pipe_audio_streamer_adapter.h b/src/components/media_manager/include/media_manager/audio/pipe_audio_streamer_adapter.h
index 3695235886..d0dbbebd38 100644
--- a/src/components/media_manager/include/media_manager/audio/pipe_audio_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/audio/pipe_audio_streamer_adapter.h
@@ -39,9 +39,8 @@ namespace media_manager {
 
 class PipeAudioStreamerAdapter : public PipeStreamerAdapter {
  public:
-  PipeAudioStreamerAdapter(
-      const std::string& named_audio_pipe_path,
-      const std::string& app_storage_folder);
+  PipeAudioStreamerAdapter(const std::string& named_audio_pipe_path,
+                           const std::string& app_storage_folder);
   ~PipeAudioStreamerAdapter();
 };
 
diff --git a/src/components/media_manager/include/media_manager/audio/socket_audio_streamer_adapter.h b/src/components/media_manager/include/media_manager/audio/socket_audio_streamer_adapter.h
index 77a58195f0..c0f3174496 100644
--- a/src/components/media_manager/include/media_manager/audio/socket_audio_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/audio/socket_audio_streamer_adapter.h
@@ -39,8 +39,8 @@ namespace media_manager {
 
 class SocketAudioStreamerAdapter : public SocketStreamerAdapter {
  public:
-  SocketAudioStreamerAdapter(
-      const std::string& server_address, uint16_t audio_streaming_port);
+  SocketAudioStreamerAdapter(const std::string& server_address,
+                             uint16_t audio_streaming_port);
   virtual ~SocketAudioStreamerAdapter();
 };
 
diff --git a/src/components/media_manager/include/media_manager/file_streamer_adapter.h b/src/components/media_manager/include/media_manager/file_streamer_adapter.h
index 52092a3616..293c6721ee 100644
--- a/src/components/media_manager/include/media_manager/file_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/file_streamer_adapter.h
@@ -42,8 +42,8 @@ namespace media_manager {
 
 class FileStreamerAdapter : public StreamerAdapter {
  public:
-  FileStreamerAdapter(
-      const std::string& file_name, const std::string& app_storage_folder);
+  FileStreamerAdapter(const std::string& file_name,
+                      const std::string& app_storage_folder);
   virtual ~FileStreamerAdapter();
 
  protected:
@@ -60,8 +60,8 @@ class FileStreamerAdapter : public StreamerAdapter {
     virtual bool Send(protocol_handler::RawMessagePtr msg);
 
    private:
-    std::string    file_name_;
-    std::string    app_storage_folder_;
+    std::string file_name_;
+    std::string app_storage_folder_;
     std::ofstream* file_stream_;
   };
 };
diff --git a/src/components/media_manager/include/media_manager/media_adapter.h b/src/components/media_manager/include/media_manager/media_adapter.h
index 73622ecd43..3fe05cae33 100644
--- a/src/components/media_manager/include/media_manager/media_adapter.h
+++ b/src/components/media_manager/include/media_manager/media_adapter.h
@@ -46,7 +46,9 @@ class MediaAdapter {
   virtual void StopActivity(int32_t application_key) = 0;
   virtual bool is_app_performing_activity(int32_t application_key) const = 0;
 
-  virtual ~MediaAdapter() { ;}
+  virtual ~MediaAdapter() {
+    ;
+  }
 };
 }  // namespace media_manager
 #endif  // SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_H_
diff --git a/src/components/media_manager/include/media_manager/media_adapter_impl.h b/src/components/media_manager/include/media_manager/media_adapter_impl.h
index a3a296150b..75c48c98b7 100644
--- a/src/components/media_manager/include/media_manager/media_adapter_impl.h
+++ b/src/components/media_manager/include/media_manager/media_adapter_impl.h
@@ -43,18 +43,18 @@ namespace media_manager {
 typedef utils::SharedPtr<MediaAdapterListener> MediaListenerPtr;
 
 class MediaAdapterImpl : public MediaAdapter {
-  public:
-    virtual ~MediaAdapterImpl();
-    virtual void AddListener(const MediaListenerPtr& listener);
-    virtual void RemoveListener(const MediaListenerPtr& listener);
+ public:
+  virtual ~MediaAdapterImpl();
+  virtual void AddListener(const MediaListenerPtr& listener);
+  virtual void RemoveListener(const MediaListenerPtr& listener);
 
-  protected:
-    MediaAdapterImpl();
-    std::set<MediaListenerPtr> media_listeners_;
-    int32_t current_application_;
+ protected:
+  MediaAdapterImpl();
+  std::set<MediaListenerPtr> media_listeners_;
+  int32_t current_application_;
 
-  private:
-    DISALLOW_COPY_AND_ASSIGN(MediaAdapterImpl);
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MediaAdapterImpl);
 };
 
 typedef utils::SharedPtr<MediaAdapterImpl> MediaAdapterImplPtr;
diff --git a/src/components/media_manager/include/media_manager/media_adapter_listener.h b/src/components/media_manager/include/media_manager/media_adapter_listener.h
index 423d41c89b..37c3925199 100644
--- a/src/components/media_manager/include/media_manager/media_adapter_listener.h
+++ b/src/components/media_manager/include/media_manager/media_adapter_listener.h
@@ -40,17 +40,14 @@ namespace media_manager {
 typedef int32_t DataForListener;
 
 class MediaAdapterListener {
-  public:
-    virtual ~MediaAdapterListener() {
-    }
-    virtual void OnDataReceived(
-      int32_t application_key,
-      const DataForListener& data) = 0;
-    virtual void OnErrorReceived(
-      int32_t application_key,
-      const DataForListener& data) = 0;
-    virtual void OnActivityStarted(int32_t application_key) = 0;
-    virtual void OnActivityEnded(int32_t application_key) = 0;
+ public:
+  virtual ~MediaAdapterListener() {}
+  virtual void OnDataReceived(int32_t application_key,
+                              const DataForListener& data) = 0;
+  virtual void OnErrorReceived(int32_t application_key,
+                               const DataForListener& data) = 0;
+  virtual void OnActivityStarted(int32_t application_key) = 0;
+  virtual void OnActivityEnded(int32_t application_key) = 0;
 };
 }  //  namespace media_manager
 #endif  // SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_LISTENER_H_
diff --git a/src/components/media_manager/include/media_manager/media_manager.h b/src/components/media_manager/include/media_manager/media_manager.h
index f1fb50e384..53e3690c13 100644
--- a/src/components/media_manager/include/media_manager/media_manager.h
+++ b/src/components/media_manager/include/media_manager/media_manager.h
@@ -39,28 +39,28 @@
 namespace media_manager {
 
 class MediaManager {
-  public:
-    virtual void PlayA2DPSource(int32_t application_key) = 0;
-    virtual void StopA2DPSource(int32_t application_key) = 0;
+ public:
+  virtual void PlayA2DPSource(int32_t application_key) = 0;
+  virtual void StopA2DPSource(int32_t application_key) = 0;
 
-    virtual void StartMicrophoneRecording(int32_t application_key,
-                                          const std::string& outputFileName,
-                                          int32_t duration) = 0;
-    virtual void StopMicrophoneRecording(int32_t application_key) = 0;
+  virtual void StartMicrophoneRecording(int32_t application_key,
+                                        const std::string& outputFileName,
+                                        int32_t duration) = 0;
+  virtual void StopMicrophoneRecording(int32_t application_key) = 0;
 
-    virtual void StartStreaming(
-        int32_t application_key, protocol_handler::ServiceType service_type) = 0;
-    virtual void StopStreaming(
-        int32_t application_key, protocol_handler::ServiceType service_type) = 0;
-    virtual void FramesProcessed(int32_t application_key,
-                                 int32_t frame_number) = 0;
-    /**
-     * \brief Media manager settings getter
-     * \return pointer to media manager settings class
-     */
-    virtual const MediaManagerSettings& settings() const = 0;
+  virtual void StartStreaming(int32_t application_key,
+                              protocol_handler::ServiceType service_type) = 0;
+  virtual void StopStreaming(int32_t application_key,
+                             protocol_handler::ServiceType service_type) = 0;
+  virtual void FramesProcessed(int32_t application_key,
+                               int32_t frame_number) = 0;
+  /**
+   * \brief Media manager settings getter
+   * \return pointer to media manager settings class
+   */
+  virtual const MediaManagerSettings& settings() const = 0;
 
-    virtual ~MediaManager(){}
+  virtual ~MediaManager() {}
 };
 
 }  // namespace media_manager
diff --git a/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h b/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h
index 8a5a85605c..1e998ef82f 100644
--- a/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h
@@ -41,8 +41,8 @@ namespace media_manager {
 
 class PipeStreamerAdapter : public StreamerAdapter {
  public:
-  PipeStreamerAdapter(
-      const std::string& named_pipe_path, const std::string& app_storage_folder);
+  PipeStreamerAdapter(const std::string& named_pipe_path,
+                      const std::string& app_storage_folder);
   virtual ~PipeStreamerAdapter();
 
  protected:
@@ -61,7 +61,7 @@ class PipeStreamerAdapter : public StreamerAdapter {
    private:
     std::string named_pipe_path_;
     std::string app_storage_folder_;
-    int32_t     pipe_fd_;
+    int32_t pipe_fd_;
   };
 };
 
diff --git a/src/components/media_manager/include/media_manager/socket_streamer_adapter.h b/src/components/media_manager/include/media_manager/socket_streamer_adapter.h
index 960c2de6c0..45311b6077 100644
--- a/src/components/media_manager/include/media_manager/socket_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/socket_streamer_adapter.h
@@ -62,12 +62,12 @@ class SocketStreamerAdapter : public StreamerAdapter {
 
    private:
     std::string ip_;
-    uint16_t    port_;
+    uint16_t port_;
     std::string header_;
 
-    int32_t     socket_fd_;
-    int32_t     send_socket_fd_;
-    bool        is_first_frame_;
+    int32_t socket_fd_;
+    int32_t send_socket_fd_;
+    bool is_first_frame_;
   };
 };
 
diff --git a/src/components/media_manager/include/media_manager/streamer_adapter.h b/src/components/media_manager/include/media_manager/streamer_adapter.h
index 81291bcfe1..30353b8d09 100644
--- a/src/components/media_manager/include/media_manager/streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/streamer_adapter.h
@@ -60,8 +60,7 @@ class StreamerAdapter : public MediaAdapterImpl {
   virtual void StopActivity(int32_t application_key);
   virtual void SendData(int32_t application_key,
                         const ::protocol_handler::RawMessagePtr msg);
-  virtual bool is_app_performing_activity(
-      int32_t application_key) const;
+  virtual bool is_app_performing_activity(int32_t application_key) const;
 
  protected:
   // TODO(AN): APPLINK-15203 Use MessageLoopThread
@@ -80,7 +79,7 @@ class StreamerAdapter : public MediaAdapterImpl {
 
    private:
     sync_primitives::atomic_bool stop_flag_;
-    StreamerAdapter*             adapter_;
+    StreamerAdapter* adapter_;
 
     DISALLOW_COPY_AND_ASSIGN(Streamer);
   };
@@ -89,7 +88,7 @@ class StreamerAdapter : public MediaAdapterImpl {
   int32_t current_application_;
   utils::MessageQueue<protocol_handler::RawMessagePtr> messages_;
 
-  Streamer*        streamer_;
+  Streamer* streamer_;
   threads::Thread* thread_;
 
   DISALLOW_COPY_AND_ASSIGN(StreamerAdapter);
diff --git a/src/components/media_manager/include/media_manager/streamer_listener.h b/src/components/media_manager/include/media_manager/streamer_listener.h
index 5b31400586..32ba167985 100644
--- a/src/components/media_manager/include/media_manager/streamer_listener.h
+++ b/src/components/media_manager/include/media_manager/streamer_listener.h
@@ -42,22 +42,20 @@ namespace media_manager {
 class MediaManager;
 
 class StreamerListener : public MediaAdapterListener {
-  public:
-    StreamerListener(MediaManager& media_manager);
-    ~StreamerListener();
-    virtual void OnDataReceived(
-      int32_t application_key,
-      const DataForListener& data);
-    virtual void OnErrorReceived(
-      int32_t application_key,
-      const DataForListener& data);
-    virtual void OnActivityStarted(int32_t application_key);
-    virtual void OnActivityEnded(int32_t application_key);
+ public:
+  StreamerListener(MediaManager& media_manager);
+  ~StreamerListener();
+  virtual void OnDataReceived(int32_t application_key,
+                              const DataForListener& data);
+  virtual void OnErrorReceived(int32_t application_key,
+                               const DataForListener& data);
+  virtual void OnActivityStarted(int32_t application_key);
+  virtual void OnActivityEnded(int32_t application_key);
 
-  private:
-    int32_t current_application_;
-    media_manager::MediaManager& media_manager_;
-    DISALLOW_COPY_AND_ASSIGN(StreamerListener);
+ private:
+  int32_t current_application_;
+  media_manager::MediaManager& media_manager_;
+  DISALLOW_COPY_AND_ASSIGN(StreamerListener);
 };
 }  //  namespace media_manager
 
diff --git a/src/components/media_manager/include/media_manager/video/file_video_streamer_adapter.h b/src/components/media_manager/include/media_manager/video/file_video_streamer_adapter.h
index 13bb76ecaa..1677b5ad34 100644
--- a/src/components/media_manager/include/media_manager/video/file_video_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/video/file_video_streamer_adapter.h
@@ -39,9 +39,8 @@ namespace media_manager {
 
 class FileVideoStreamerAdapter : public FileStreamerAdapter {
  public:
-  FileVideoStreamerAdapter(
-      const std::string& video_stream_file,
-      const std::string& app_storage_folder);
+  FileVideoStreamerAdapter(const std::string& video_stream_file,
+                           const std::string& app_storage_folder);
   ~FileVideoStreamerAdapter();
 };
 
diff --git a/src/components/media_manager/include/media_manager/video/pipe_video_streamer_adapter.h b/src/components/media_manager/include/media_manager/video/pipe_video_streamer_adapter.h
index b961cad026..3bf5723572 100644
--- a/src/components/media_manager/include/media_manager/video/pipe_video_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/video/pipe_video_streamer_adapter.h
@@ -39,9 +39,8 @@ namespace media_manager {
 
 class PipeVideoStreamerAdapter : public PipeStreamerAdapter {
  public:
-  PipeVideoStreamerAdapter(
-      const std::string& named_video_pipe_path,
-      const std::string& app_storage_folder);
+  PipeVideoStreamerAdapter(const std::string& named_video_pipe_path,
+                           const std::string& app_storage_folder);
   ~PipeVideoStreamerAdapter();
 };
 
diff --git a/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h b/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h
index 04c5aa5cf7..ad5739bd5f 100644
--- a/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h
@@ -42,8 +42,8 @@ namespace media_manager {
 
 class SocketVideoStreamerAdapter : public SocketStreamerAdapter {
  public:
-  SocketVideoStreamerAdapter(
-      const std::string& server_address, uint16_t video_streaming_port);
+  SocketVideoStreamerAdapter(const std::string& server_address,
+                             uint16_t video_streaming_port);
   virtual ~SocketVideoStreamerAdapter();
 };