Replace deprecation comments with DEPRECATED macro

24 files changed, 122 insertions, 159 deletions

diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h
index 4e10d8d435..eca22afa63 100644
--- a/src/components/application_manager/include/application_manager/application.h
+++ b/src/components/application_manager/include/application_manager/application.h
@@ -48,6 +48,7 @@
 #include "application_manager/application_state.h"
 #include "protocol_handler/protocol_handler.h"
 #include "smart_objects/smart_object.h"
+#include "utils/macro.h"
 
 namespace application_manager {
 
@@ -561,8 +562,8 @@ class Application : public virtual InitialApplicationData,
   virtual void increment_list_files_in_none_count() = 0;
   virtual bool set_app_icon_path(const std::string& file_name) = 0;
   virtual void set_app_allowed(const bool allowed) = 0;
-  // DEPRECATED
-  virtual void set_device(connection_handler::DeviceHandle device) = 0;
+  DEPRECATED virtual void set_device(
+      connection_handler::DeviceHandle device) = 0;
   virtual uint32_t get_grammar_id() const = 0;
   virtual void set_grammar_id(uint32_t value) = 0;
 
diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h
index 3d7e29fb99..10ec8b8eb8 100644
--- a/src/components/application_manager/include/application_manager/application_impl.h
+++ b/src/components/application_manager/include/application_manager/application_impl.h
@@ -52,6 +52,7 @@
 #include "utils/atomic_object.h"
 #include "utils/custom_string.h"
 #include "utils/timer.h"
+#include "utils/macro.h"
 
 namespace usage_statistics {
 
@@ -91,8 +92,7 @@ class ApplicationImpl : public virtual Application,
       utils::SharedPtr<usage_statistics::StatisticsManager> statistics_manager,
       ApplicationManager& application_manager);
 
-  // DEPRECATED
-  ApplicationImpl(
+  DEPRECATED ApplicationImpl(
       uint32_t application_id,
       const std::string& policy_app_id,
       const std::string& mac_address,
@@ -184,8 +184,7 @@ class ApplicationImpl : public virtual Application,
   void increment_list_files_in_none_count();
   bool set_app_icon_path(const std::string& path);
   void set_app_allowed(const bool allowed);
-  // DEPRECATED
-  void set_device(connection_handler::DeviceHandle device);
+  DEPRECATED void set_device(connection_handler::DeviceHandle device);
   virtual uint32_t get_grammar_id() const;
   virtual void set_grammar_id(uint32_t value);
   bool is_audio() const OVERRIDE;
@@ -223,13 +222,6 @@ class ApplicationImpl : public virtual Application,
 
   virtual const std::string& curHash() const;
 
-#ifdef CUSTOMER_PASA
-  // DEPRECATED
-  virtual bool flag_sending_hash_change_after_awake() const;
-  // DEPRECATED
-  virtual void set_flag_sending_hash_change_after_awake(bool flag);
-#endif  // CUSTOMER_PASA
-
   /**
    * @brief Change Hash for current application
    * and send notification to mobile
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h
index 5962ca5b11..e91bdf5d59 100644
--- a/src/components/application_manager/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/application_manager_impl.h
@@ -453,11 +453,9 @@ class ApplicationManagerImpl
    */
   void UnregisterAllApplications();
 
-  // DEPRECATED
-  bool RemoveAppDataFromHMI(ApplicationSharedPtr app);
+  DEPRECATED bool RemoveAppDataFromHMI(ApplicationSharedPtr app);
 
-  // DEPRECATED
-  bool LoadAppDataToHMI(ApplicationSharedPtr app);
+  DEPRECATED bool LoadAppDataToHMI(ApplicationSharedPtr app);
   bool ActivateApplication(ApplicationSharedPtr app) OVERRIDE;
 
   /**
@@ -1485,9 +1483,8 @@ class ApplicationManagerImpl
    * @param service_type Type of service to start
    * @return True on success, false on fail
    */
-  // DEPRECATED
-  bool StartNaviService(uint32_t app_id,
-                        protocol_handler::ServiceType service_type);
+  DEPRECATED bool StartNaviService(uint32_t app_id,
+                                   protocol_handler::ServiceType service_type);
 
   /**
    * @brief Starts specified navi service for application
@@ -1765,8 +1762,7 @@ class ApplicationManagerImpl
   DISALLOW_COPY_AND_ASSIGN(ApplicationManagerImpl);
 };
 
-// DEPRECATED
-bool ApplicationManagerImpl::vr_session_started() const {
+DEPRECATED bool ApplicationManagerImpl::vr_session_started() const {
   return is_vr_session_strated_;
 }
 
diff --git a/src/components/application_manager/include/application_manager/hmi_state.h b/src/components/application_manager/include/application_manager/hmi_state.h
index a747c9b0f7..f2d665d998 100644
--- a/src/components/application_manager/include/application_manager/hmi_state.h
+++ b/src/components/application_manager/include/application_manager/hmi_state.h
@@ -36,6 +36,7 @@
 #include <list>
 #include "interfaces/MOBILE_API.h"
 #include "utils/shared_ptr.h"
+#include "utils/macro.h"
 
 namespace application_manager {
 
@@ -247,8 +248,7 @@ class VRHmiState : public HmiState {
   VRHmiState(utils::SharedPtr<Application> app,
              const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  VRHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED VRHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
 };
 
 /**
@@ -259,8 +259,7 @@ class TTSHmiState : public HmiState {
   TTSHmiState(utils::SharedPtr<Application> app,
               const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  TTSHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED TTSHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
 
   virtual mobile_apis::AudioStreamingState::eType audio_streaming_state()
       const OVERRIDE;
@@ -275,8 +274,8 @@ class NaviStreamingHmiState : public HmiState {
   NaviStreamingHmiState(utils::SharedPtr<Application> app,
                         const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  NaviStreamingHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED NaviStreamingHmiState(uint32_t app_id,
+                                   const ApplicationManager& app_mngr);
 
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
       const OVERRIDE;
@@ -291,8 +290,8 @@ class PhoneCallHmiState : public HmiState {
   PhoneCallHmiState(utils::SharedPtr<Application> app,
                     const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  PhoneCallHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED PhoneCallHmiState(uint32_t app_id,
+                               const ApplicationManager& app_mngr);
 
   mobile_apis::HMILevel::eType hmi_level() const OVERRIDE;
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
@@ -310,8 +309,8 @@ class SafetyModeHmiState : public HmiState {
   SafetyModeHmiState(utils::SharedPtr<Application> app,
                      const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  SafetyModeHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED SafetyModeHmiState(uint32_t app_id,
+                                const ApplicationManager& app_mngr);
 
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
       const OVERRIDE {
@@ -328,8 +327,7 @@ class DeactivateHMI : public HmiState {
   DeactivateHMI(utils::SharedPtr<Application> app,
                 const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  DeactivateHMI(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED DeactivateHMI(uint32_t app_id, const ApplicationManager& app_mngr);
 
   mobile_apis::HMILevel::eType hmi_level() const OVERRIDE;
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
@@ -347,8 +345,7 @@ class AudioSource : public HmiState {
   AudioSource(utils::SharedPtr<Application> app,
               const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  AudioSource(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED AudioSource(uint32_t app_id, const ApplicationManager& app_mngr);
 
   mobile_apis::HMILevel::eType hmi_level() const OVERRIDE;
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
@@ -367,8 +364,7 @@ class EmbeddedNavi : public HmiState {
   EmbeddedNavi(utils::SharedPtr<Application> app,
                const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  EmbeddedNavi(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED EmbeddedNavi(uint32_t app_id, const ApplicationManager& app_mngr);
 
   mobile_apis::HMILevel::eType hmi_level() const OVERRIDE;
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data.h b/src/components/application_manager/include/application_manager/resumption/resumption_data.h
index a9954141af..bee2bce570 100644
--- a/src/components/application_manager/include/application_manager/resumption/resumption_data.h
+++ b/src/components/application_manager/include/application_manager/resumption/resumption_data.h
@@ -36,6 +36,7 @@
 #include "smart_objects/smart_object.h"
 #include "application_manager/application.h"
 #include "application_manager/application_manager.h"
+#include "utils/macro.h"
 
 namespace application_manager {
 class ApplicationManagerSettings;
@@ -97,8 +98,7 @@ class ResumptionData {
    * @brief Increments ignition counter for all registered applications
    * and remember ign_off time stamp
    */
-  // DEPRECATED
-  virtual void OnSuspend() = 0;
+  DEPRECATED virtual void OnSuspend() = 0;
 
   /**
    * @brief Decrements ignition counter for all registered applications
@@ -108,8 +108,7 @@ class ResumptionData {
   /**
    * @brief Decrements ignition counter for all registered applications
    */
-  // DEPRECATED
-  virtual void OnAwake() = 0;
+  DEPRECATED virtual void OnAwake() = 0;
 
   /**
    * @brief Retrieves hash ID for the given mobile app ID
diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h
index 474597398c..a8032d1f65 100644
--- a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h
+++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h
@@ -114,14 +114,12 @@ class ResumptionDataDB : public ResumptionData {
    * @brief Increments ignition counter for all registered applications
    * and remember ign_off time stamp
    */
-  // DEPRECATED
-  void OnSuspend() FINAL;
+  DEPRECATED void OnSuspend() FINAL;
 
   /**
    * @brief Decrements ignition counter for all registered applications
    */
-  // DEPRECATED
-  void OnAwake() FINAL;
+  DEPRECATED void OnAwake() FINAL;
 
   /**
    * @brief Increments ignition counter for all registered applications
diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h
index 4da3441037..82ec1d9e5c 100644
--- a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h
+++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h
@@ -85,14 +85,12 @@ class ResumptionDataJson : public ResumptionData {
    * @brief Increments ignition counter for all registered applications
    * and remember ign_off time stamp
    */
-  // DEPRECATED
-  void OnSuspend() FINAL;
+  DEPRECATED void OnSuspend() FINAL;
 
   /**
    * @brief Decrements ignition counter for all registered applications
    */
-  // DEPRECATED
-  void OnAwake() FINAL;
+  DEPRECATED void OnAwake() FINAL;
 
   /**
    * @brief Increments ignition counter for all registered applications
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc
index eaf097d43f..735a9955a7 100644
--- a/src/components/application_manager/src/application_impl.cc
+++ b/src/components/application_manager/src/application_impl.cc
@@ -614,8 +614,8 @@ void ApplicationImpl::set_app_allowed(const bool allowed) {
   is_app_allowed_ = allowed;
 }
 
-// DEPRECATED
-void ApplicationImpl::set_device(connection_handler::DeviceHandle device) {
+DEPRECATED void ApplicationImpl::set_device(
+    connection_handler::DeviceHandle device) {
   device_id_ = device;
 }
 
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index cf8aae75f3..eb3313e492 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -638,13 +638,13 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication(
   return application;
 }
 
-// DEPRECATED
-bool ApplicationManagerImpl::RemoveAppDataFromHMI(ApplicationSharedPtr app) {
+DEPRECATED bool ApplicationManagerImpl::RemoveAppDataFromHMI(
+    ApplicationSharedPtr app) {
   return true;
 }
 
-// DEPRECATED
-bool ApplicationManagerImpl::LoadAppDataToHMI(ApplicationSharedPtr app) {
+DEPRECATED bool ApplicationManagerImpl::LoadAppDataToHMI(
+    ApplicationSharedPtr app) {
   return true;
 }
 
@@ -795,8 +795,8 @@ void ApplicationManagerImpl::set_driver_distraction(const bool is_distracting) {
   is_distracting_driver_ = is_distracting;
 }
 
-// DEPRECATED
-void ApplicationManagerImpl::set_vr_session_started(const bool state) {
+DEPRECATED void ApplicationManagerImpl::set_vr_session_started(
+    const bool state) {
   is_vr_session_strated_ = state;
 }
 
diff --git a/src/components/application_manager/src/commands/command_impl.cc b/src/components/application_manager/src/commands/command_impl.cc
index ea179a5bfc..b928184148 100644
--- a/src/components/application_manager/src/commands/command_impl.cc
+++ b/src/components/application_manager/src/commands/command_impl.cc
@@ -139,8 +139,7 @@ bool CommandImpl::ReplaceMobileWithHMIAppId(
   return true;
 }
 
-// DEPRECATED
-void CommandImpl::ReplaceMobileByHMIAppId(
+DEPRECATED void CommandImpl::ReplaceMobileByHMIAppId(
     NsSmartDeviceLink::NsSmartObjects::SmartObject& message) {
   if (!ReplaceMobileWithHMIAppId(message)) {
     LOG4CXX_ERROR(logger_, "Substitution mobile --> HMI id is failed.");
@@ -192,8 +191,7 @@ bool CommandImpl::ReplaceHMIWithMobileAppId(
   return true;
 }
 
-// DEPRECATED
-void CommandImpl::ReplaceHMIByMobileAppId(
+DEPRECATED void CommandImpl::ReplaceHMIByMobileAppId(
     NsSmartDeviceLink::NsSmartObjects::SmartObject& message) {
   if (!ReplaceHMIWithMobileAppId(message)) {
     LOG4CXX_ERROR(logger_, "Substitution HMI --> mobile id is failed.");
diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
index 870ff532da..a3a30ddb20 100644
--- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
@@ -741,8 +741,8 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
   SendChangeRegistrationOnHMI(application);
 }
 
-// DEPRECATED
-void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile() {
+DEPRECATED void
+RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile() {
   SendRegisterAppInterfaceResponseToMobile(ApplicationType::kNewApplication);
 }
 
diff --git a/src/components/application_manager/src/hmi_state.cc b/src/components/application_manager/src/hmi_state.cc
index f67de7a957..bc1ccd8f42 100644
--- a/src/components/application_manager/src/hmi_state.cc
+++ b/src/components/application_manager/src/hmi_state.cc
@@ -56,10 +56,9 @@ HmiState::HmiState(utils::SharedPtr<Application> app,
     , audio_streaming_state_(mobile_apis::AudioStreamingState::INVALID_ENUM)
     , system_context_(mobile_apis::SystemContext::INVALID_ENUM) {}
 
-// DEPRECATED
-HmiState::HmiState(uint32_t app_id,
-                   const ApplicationManager& app_mngr,
-                   StateID state_id)
+DEPRECATED HmiState::HmiState(uint32_t app_id,
+                              const ApplicationManager& app_mngr,
+                              StateID state_id)
     : state_id_(state_id)
     , app_mngr_(app_mngr)
     , hmi_level_(mobile_apis::HMILevel::INVALID_ENUM)
@@ -68,8 +67,8 @@ HmiState::HmiState(uint32_t app_id,
   app_ = app_mngr_.application(app_id);
 }
 
-// DEPRECATED
-HmiState::HmiState(uint32_t app_id, const ApplicationManager& app_mngr)
+DEPRECATED HmiState::HmiState(uint32_t app_id,
+                              const ApplicationManager& app_mngr)
     : state_id_(STATE_ID_REGULAR)
     , app_mngr_(app_mngr)
     , hmi_level_(mobile_apis::HMILevel::INVALID_ENUM)
@@ -109,16 +108,16 @@ VRHmiState::VRHmiState(utils::SharedPtr<Application> app,
                        const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_VR_SESSION) {}
 
-// DEPRECATED
-VRHmiState::VRHmiState(uint32_t app_id, const ApplicationManager& app_mngr)
+DEPRECATED VRHmiState::VRHmiState(uint32_t app_id,
+                                  const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_VR_SESSION) {}
 
 TTSHmiState::TTSHmiState(utils::SharedPtr<Application> app,
                          const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_TTS_SESSION) {}
 
-// DEPRECATED
-TTSHmiState::TTSHmiState(uint32_t app_id, const ApplicationManager& app_mngr)
+DEPRECATED TTSHmiState::TTSHmiState(uint32_t app_id,
+                                    const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_TTS_SESSION) {}
 
 mobile_apis::AudioStreamingState::eType TTSHmiState::audio_streaming_state()
@@ -140,9 +139,8 @@ NaviStreamingHmiState::NaviStreamingHmiState(utils::SharedPtr<Application> app,
                                              const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_NAVI_STREAMING) {}
 
-// DEPRECATED
-NaviStreamingHmiState::NaviStreamingHmiState(uint32_t app_id,
-                                             const ApplicationManager& app_mngr)
+DEPRECATED NaviStreamingHmiState::NaviStreamingHmiState(
+    uint32_t app_id, const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_NAVI_STREAMING) {}
 
 mobile_apis::AudioStreamingState::eType
@@ -165,9 +163,8 @@ PhoneCallHmiState::PhoneCallHmiState(utils::SharedPtr<Application> app,
                                      const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_PHONE_CALL) {}
 
-// DEPRECATED
-PhoneCallHmiState::PhoneCallHmiState(uint32_t app_id,
-                                     const ApplicationManager& app_mngr)
+DEPRECATED PhoneCallHmiState::PhoneCallHmiState(
+    uint32_t app_id, const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_PHONE_CALL) {}
 
 mobile_apis::HMILevel::eType PhoneCallHmiState::hmi_level() const {
@@ -191,18 +188,16 @@ SafetyModeHmiState::SafetyModeHmiState(utils::SharedPtr<Application> app,
                                        const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_SAFETY_MODE) {}
 
-// DEPRECATED
-SafetyModeHmiState::SafetyModeHmiState(uint32_t app_id,
-                                       const ApplicationManager& app_mngr)
+DEPRECATED SafetyModeHmiState::SafetyModeHmiState(
+    uint32_t app_id, const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_SAFETY_MODE) {}
 
 DeactivateHMI::DeactivateHMI(utils::SharedPtr<Application> app,
                              const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_DEACTIVATE_HMI) {}
 
-// DERECATED
-DeactivateHMI::DeactivateHMI(uint32_t app_id,
-                             const ApplicationManager& app_mngr)
+DEPRECATED DeactivateHMI::DeactivateHMI(uint32_t app_id,
+                                        const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_DEACTIVATE_HMI) {}
 
 mobile_apis::HMILevel::eType DeactivateHMI::hmi_level() const {
@@ -220,8 +215,8 @@ AudioSource::AudioSource(utils::SharedPtr<Application> app,
                          const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_AUDIO_SOURCE) {}
 
-// DEPRECATED
-AudioSource::AudioSource(uint32_t app_id, const ApplicationManager& app_mngr)
+DEPRECATED AudioSource::AudioSource(uint32_t app_id,
+                                    const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_AUDIO_SOURCE) {}
 
 mobile_apis::HMILevel::eType AudioSource::hmi_level() const {
@@ -245,8 +240,8 @@ EmbeddedNavi::EmbeddedNavi(utils::SharedPtr<Application> app,
                            const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_EMBEDDED_NAVI) {}
 
-// DEPRECATED
-EmbeddedNavi::EmbeddedNavi(uint32_t app_id, const ApplicationManager& app_mngr)
+DEPRECATED EmbeddedNavi::EmbeddedNavi(uint32_t app_id,
+                                      const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_EMBEDDED_NAVI) {}
 
 mobile_apis::HMILevel::eType EmbeddedNavi::hmi_level() const {
diff --git a/src/components/application_manager/src/resumption/resumption_data_db.cc b/src/components/application_manager/src/resumption/resumption_data_db.cc
index bd439e05bc..b031fd0afd 100644
--- a/src/components/application_manager/src/resumption/resumption_data_db.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_db.cc
@@ -212,8 +212,7 @@ uint32_t ResumptionDataDB::GetHMIApplicationID(
   return hmi_app_id;
 }
 
-// DEPRECATED
-void ResumptionDataDB::OnSuspend() {}
+DEPRECATED void ResumptionDataDB::OnSuspend() {}
 
 void ResumptionDataDB::IncrementIgnOffCount() {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -294,8 +293,7 @@ bool ResumptionDataDB::GetHashId(const std::string& policy_app_id,
   return SelectHashId(policy_app_id, device_id, hash_id);
 }
 
-// DEPRECATED
-void ResumptionDataDB::OnAwake() {}
+DEPRECATED void ResumptionDataDB::OnAwake() {}
 
 void ResumptionDataDB::DecrementIgnOffCount() {
   LOG4CXX_AUTO_TRACE(logger_);
diff --git a/src/components/application_manager/src/resumption/resumption_data_json.cc b/src/components/application_manager/src/resumption/resumption_data_json.cc
index 5bbf36dfdd..e99d8bae26 100644
--- a/src/components/application_manager/src/resumption/resumption_data_json.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_json.cc
@@ -143,8 +143,7 @@ uint32_t ResumptionDataJson::GetHMIApplicationID(
   return hmi_app_id;
 }
 
-// DEPRECATED
-void ResumptionDataJson::OnSuspend() {}
+DEPRECATED void ResumptionDataJson::OnSuspend() {}
 
 void ResumptionDataJson::IncrementIgnOffCount() {
   using namespace app_mngr;
@@ -170,8 +169,7 @@ void ResumptionDataJson::IncrementIgnOffCount() {
   LOG4CXX_DEBUG(logger_, GetResumptionData().toStyledString());
 }
 
-// DEPRECATED
-void ResumptionDataJson::OnAwake() {}
+DEPRECATED void ResumptionDataJson::OnAwake() {}
 
 void ResumptionDataJson::DecrementIgnOffCount() {
   using namespace app_mngr;
diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h
index 9790774831..10cf5f746e 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application.h
@@ -50,10 +50,9 @@ class MockApplication : public ::application_manager::Application {
   MOCK_CONST_METHOD0(active_message, const smart_objects::SmartObject*());
   MOCK_CONST_METHOD0(curHash, const std::string&());
   MOCK_METHOD0(UpdateHash, void());
-  // DEPRECATED
-  MOCK_CONST_METHOD0(flag_sending_hash_change_after_awake, bool());
-  // DEPRECATED
-  MOCK_METHOD1(set_flag_sending_hash_change_after_awake, void(bool flag));
+  DEPRECATED MOCK_CONST_METHOD0(flag_sending_hash_change_after_awake, bool());
+  DEPRECATED MOCK_METHOD1(set_flag_sending_hash_change_after_awake,
+                          void(bool flag));
   MOCK_CONST_METHOD0(IsHashChangedDuringSuspend, bool());
   MOCK_METHOD1(SetHashChangedDuringSuspend, void(const bool flag));
   MOCK_CONST_METHOD0(is_application_data_changed, bool());
diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
index a4d228f0fe..c2bac31c1b 100644
--- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
+++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
@@ -502,10 +502,10 @@ class ConnectionHandlerImpl
    * \param device_id Returned: DeviceID
    * \return int32_t -1 in case of error or 0 in case of success
    */
-  int32_t GetDataOnSessionKey(uint32_t key,
-                              uint32_t* app_id,
-                              std::list<int32_t>* sessions_list,
-                              uint32_t* device_id) const OVERRIDE;
+  DEPRECATED int32_t GetDataOnSessionKey(uint32_t key,
+                                         uint32_t* app_id,
+                                         std::list<int32_t>* sessions_list,
+                                         uint32_t* device_id) const OVERRIDE;
 
   const ConnectionHandlerSettings& get_settings() const OVERRIDE;
 
diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc
index c95d075a14..c8f3dd8932 100644
--- a/src/components/connection_handler/src/connection_handler_impl.cc
+++ b/src/components/connection_handler/src/connection_handler_impl.cc
@@ -740,12 +740,11 @@ int32_t ConnectionHandlerImpl::GetDataOnSessionKey(
   return 0;
 }
 
-// DEPRECATED
-int32_t ConnectionHandlerImpl::GetDataOnSessionKey(
-    uint32_t key,
-    uint32_t* app_id,
-    std::list<int32_t>* sessions_list,
-    uint32_t* device_id) const {
+DEPRECATED int32_t
+ConnectionHandlerImpl::GetDataOnSessionKey(uint32_t key,
+                                           uint32_t* app_id,
+                                           std::list<int32_t>* sessions_list,
+                                           uint32_t* device_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
   return GetDataOnSessionKey(key, app_id, sessions_list, device_id);
 }
diff --git a/src/components/include/connection_handler/connection_handler.h b/src/components/include/connection_handler/connection_handler.h
index 3961a3f27d..1fcf5e4477 100644
--- a/src/components/include/connection_handler/connection_handler.h
+++ b/src/components/include/connection_handler/connection_handler.h
@@ -39,6 +39,7 @@
 #include "connection_handler/device.h"
 #include "connection_handler/connection.h"
 #include "connection_handler/devices_discovery_starter.h"
+#include "utils/macro.h"
 
 /**
  * \namespace connection_handler
@@ -190,10 +191,11 @@ class ConnectionHandler {
    * \param device_id Returned: DeviceID
    * \return int32_t -1 in case of error or 0 in case of success
    */
-  virtual int32_t GetDataOnSessionKey(uint32_t key,
-                                      uint32_t* app_id,
-                                      std::list<int32_t>* sessions_list,
-                                      uint32_t* device_id) const = 0;
+  DEPRECATED virtual int32_t GetDataOnSessionKey(
+      uint32_t key,
+      uint32_t* app_id,
+      std::list<int32_t>* sessions_list,
+      uint32_t* device_id) const = 0;
 
   /**
    * @brief GetConnectedDevicesMAC allows to obtain MAC adresses for all
diff --git a/src/components/include/protocol_handler/session_observer.h b/src/components/include/protocol_handler/session_observer.h
index 35cbb8da94..4648e678c2 100644
--- a/src/components/include/protocol_handler/session_observer.h
+++ b/src/components/include/protocol_handler/session_observer.h
@@ -36,6 +36,7 @@
 #include <list>
 #include <string>
 #include "transport_manager/transport_manager.h"
+#include "utils/macro.h"
 #ifdef ENABLE_SECURITY
 #include "security_manager/ssl_context.h"
 #endif  // ENABLE_SECURITY
diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h
index cb1597c6d7..4f2d964488 100644
--- a/src/components/include/test/application_manager/mock_application_manager.h
+++ b/src/components/include/test/application_manager/mock_application_manager.h
@@ -250,13 +250,13 @@ class MockApplicationManager : public application_manager::ApplicationManager {
                          mobile_apis::HMILevel::eType hmi_level,
                          mobile_apis::AudioStreamingState::eType audio_state,
                          mobile_apis::SystemContext::eType system_context));
-  // DEPRECATED
-  MOCK_CONST_METHOD4(CreateRegularState,
-                     application_manager::HmiStatePtr(
-                         uint32_t app_id,
-                         mobile_apis::HMILevel::eType hmi_level,
-                         mobile_apis::AudioStreamingState::eType audio_state,
-                         mobile_apis::SystemContext::eType system_context));
+  DEPRECATED MOCK_CONST_METHOD4(
+      CreateRegularState,
+      application_manager::HmiStatePtr(
+          uint32_t app_id,
+          mobile_apis::HMILevel::eType hmi_level,
+          mobile_apis::AudioStreamingState::eType audio_state,
+          mobile_apis::SystemContext::eType system_context));
 
   MOCK_METHOD2(SendAudioPassThroughNotification,
                void(uint32_t session_key, std::vector<uint8_t>& binary_data));
@@ -269,12 +269,10 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_METHOD0(event_dispatcher,
                application_manager::event_engine::EventDispatcher&());
 
-  // DEPRECATED
-  MOCK_CONST_METHOD1(IsAppSubscribedForWayPoints, bool(const uint32_t));
-  // DEPRECATED
-  MOCK_METHOD1(SubscribeAppForWayPoints, void(const uint32_t));
-  // DEPRECATED
-  MOCK_METHOD1(UnsubscribeAppFromWayPoints, void(const uint32_t));
+  DEPRECATED MOCK_CONST_METHOD1(IsAppSubscribedForWayPoints,
+                                bool(const uint32_t));
+  DEPRECATED MOCK_METHOD1(SubscribeAppForWayPoints, void(const uint32_t));
+  DEPRECATED MOCK_METHOD1(UnsubscribeAppFromWayPoints, void(const uint32_t));
   MOCK_CONST_METHOD1(IsAppSubscribedForWayPoints,
                      bool(application_manager::ApplicationSharedPtr));
   MOCK_METHOD1(SubscribeAppForWayPoints,
diff --git a/src/components/include/test/connection_handler/mock_connection_handler.h b/src/components/include/test/connection_handler/mock_connection_handler.h
index f1416c999e..20be7b64e9 100644
--- a/src/components/include/test/connection_handler/mock_connection_handler.h
+++ b/src/components/include/test/connection_handler/mock_connection_handler.h
@@ -85,12 +85,11 @@ class MockConnectionHandler : public connection_handler::ConnectionHandler {
   MOCK_METHOD2(BindProtocolVersionWithSession,
                void(uint32_t connection_key, uint8_t protocol_version));
 
-  // DEPRECATED
-  MOCK_CONST_METHOD4(GetDataOnSessionKey,
-                     int32_t(uint32_t key,
-                             uint32_t* app_id,
-                             std::list<int32_t>* sessions_list,
-                             uint32_t* device_id));
+  DEPRECATED MOCK_CONST_METHOD4(GetDataOnSessionKey,
+                                int32_t(uint32_t key,
+                                        uint32_t* app_id,
+                                        std::list<int32_t>* sessions_list,
+                                        uint32_t* device_id));
   MOCK_CONST_METHOD4(GetDataOnSessionKey,
                      int32_t(uint32_t key,
                              uint32_t* app_id,
diff --git a/src/components/include/test/connection_handler/mock_connection_handler_observer.h b/src/components/include/test/connection_handler/mock_connection_handler_observer.h
index 9ca19f25f0..bb5ad7cad0 100644
--- a/src/components/include/test/connection_handler/mock_connection_handler_observer.h
+++ b/src/components/include/test/connection_handler/mock_connection_handler_observer.h
@@ -48,11 +48,11 @@ class MockConnectionHandlerObserver
   MOCK_METHOD0(OnFindNewApplicationsRequest, void());
   MOCK_METHOD1(RemoveDevice,
                void(const connection_handler::DeviceHandle& device_handle));
-  // DEPRECATED
-  MOCK_METHOD3(OnServiceStartedCallback,
-               bool(const connection_handler::DeviceHandle& device_handle,
-                    const int32_t& session_key,
-                    const protocol_handler::ServiceType& type));
+  DEPRECATED MOCK_METHOD3(
+      OnServiceStartedCallback,
+      bool(const connection_handler::DeviceHandle& device_handle,
+           const int32_t& session_key,
+           const protocol_handler::ServiceType& type));
   MOCK_METHOD4(OnServiceStartedCallback,
                void(const connection_handler::DeviceHandle& device_handle,
                     const int32_t& session_key,
diff --git a/src/components/include/test/protocol_handler/mock_session_observer.h b/src/components/include/test/protocol_handler/mock_session_observer.h
index 197a4a86a9..350704ae86 100644
--- a/src/components/include/test/protocol_handler/mock_session_observer.h
+++ b/src/components/include/test/protocol_handler/mock_session_observer.h
@@ -46,8 +46,7 @@ namespace protocol_handler_test {
  */
 class MockSessionObserver : public ::protocol_handler::SessionObserver {
  public:
-  // DEPRECATED
-  MOCK_METHOD5(
+  DEPRECATED MOCK_METHOD5(
       OnSessionStartedCallback,
       uint32_t(const transport_manager::ConnectionUID connection_handle,
                const uint8_t sessionId,
@@ -89,12 +88,11 @@ class MockSessionObserver : public ::protocol_handler::SessionObserver {
                              uint32_t* app_id,
                              std::list<int32_t>* sessions_list,
                              transport_manager::DeviceHandle* device_id));
-  // DEPRECATED
-  MOCK_CONST_METHOD4(GetDataOnSessionKey,
-                     int32_t(uint32_t key,
-                             uint32_t* app_id,
-                             std::list<int32_t>* sessions_list,
-                             uint32_t* device_id));
+  DEPRECATED MOCK_CONST_METHOD4(GetDataOnSessionKey,
+                                int32_t(uint32_t key,
+                                        uint32_t* app_id,
+                                        std::list<int32_t>* sessions_list,
+                                        uint32_t* device_id));
 
   MOCK_CONST_METHOD5(GetDataOnDeviceID,
                      int32_t(transport_manager::DeviceHandle device_handle,
@@ -103,13 +101,12 @@ class MockSessionObserver : public ::protocol_handler::SessionObserver {
                              std::string* mac_address,
                              std::string* connection_type));
 
-  // DEPRECATED
-  MOCK_CONST_METHOD5(GetDataOnDeviceID,
-                     int32_t(uint32_t device_handle,
-                             std::string* device_name,
-                             std::list<uint32_t>* applications_list,
-                             std::string* mac_address,
-                             std::string* connection_type));
+  DEPRECATED MOCK_CONST_METHOD5(GetDataOnDeviceID,
+                                int32_t(uint32_t device_handle,
+                                        std::string* device_name,
+                                        std::list<uint32_t>* applications_list,
+                                        std::string* mac_address,
+                                        std::string* connection_type));
 
   MOCK_CONST_METHOD2(IsHeartBeatSupported,
                      bool(transport_manager::ConnectionUID connection_handle,
diff --git a/src/components/remote_control/test/include/mock_application.h b/src/components/remote_control/test/include/mock_application.h
index 2575002a38..e50a869be7 100644
--- a/src/components/remote_control/test/include/mock_application.h
+++ b/src/components/remote_control/test/include/mock_application.h
@@ -59,10 +59,9 @@ class MockApplication : public ::application_manager::Application {
   MOCK_CONST_METHOD0(active_message, const smart_objects::SmartObject*());
   MOCK_CONST_METHOD0(curHash, const std::string&());
   MOCK_METHOD0(UpdateHash, void());
-  // DEPRECATED
-  MOCK_CONST_METHOD0(flag_sending_hash_change_after_awake, bool());
-  // DEPRECATED
-  MOCK_METHOD1(set_flag_sending_hash_change_after_awake, void(bool flag));
+  DEPRECATED MOCK_CONST_METHOD0(flag_sending_hash_change_after_awake, bool());
+  DEPRECATED MOCK_METHOD1(set_flag_sending_hash_change_after_awake,
+                          void(bool flag));
   MOCK_CONST_METHOD0(IsHashChangedDuringSuspend, bool());
   MOCK_METHOD1(SetHashChangedDuringSuspend, void(const bool state));
   MOCK_CONST_METHOD0(is_application_data_changed, bool());