Fixes after rebase

19 files changed, 72 insertions, 64 deletions

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 3be9f56a3f..702f7a9a4d 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
@@ -582,7 +582,7 @@ class ApplicationManagerImpl
       const uint32_t connection_key,
       hmi_apis::Common_ServiceType::eType service_type,
       hmi_apis::Common_ServiceEvent::eType service_event,
-      utils::Optional<hmi_apis::Common_ServiceUpdateReason::eType>
+      utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>
           service_update_reason) FINAL;
 
   bool OnPTUFailed() FINAL;
diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index f878179695..b0412a52cf 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -111,7 +111,8 @@ class MessageHelper {
    public:
     typedef hmi_apis::Common_ServiceType::eType ServiceType;
     typedef hmi_apis::Common_ServiceEvent::eType ServiceEvent;
-    typedef hmi_apis::Common_ServiceUpdateReason::eType ServiceUpdateReason;
+    typedef hmi_apis::Common_ServiceStatusUpdateReason::eType
+        ServiceStatusUpdateReason;
 
     /**
      * @brief CreateBuilder creates builder instance
@@ -135,7 +136,7 @@ class MessageHelper {
      * @returns ref to builder instance
      */
     ServiceStatusUpdateNotificationBuilder& AddServiceUpdateReason(
-        const ServiceUpdateReason service_update_reason);
+        const ServiceStatusUpdateReason service_update_reason);
 
     /**
      * @brief notification gets notification SO
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index d2dcc109f2..21e39dad96 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -462,8 +462,12 @@ class PolicyHandler : public PolicyHandlerInterface,
                              std::string& cloud_transport_type,
                              std::string& hybrid_app_preference) const OVERRIDE;
 
+  void OnAuthTokenUpdated(const std::string& policy_app_id,
+                          const std::string& auth_token) OVERRIDE;
+
   /**
-   * @brief Callback for when a SetCloudAppProperties message is received from a
+   * @brief Callback for when a SetCloudAppProperties message is received
+   * from a
    * mobile app
    * @param message The SetCloudAppProperties message
    */
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 1b8fd0187e..b737e452a2 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -2031,7 +2031,7 @@ void ApplicationManagerImpl::ProcessServiceStatusUpdate(
     const uint32_t connection_key,
     hmi_apis::Common_ServiceType::eType service_type,
     hmi_apis::Common_ServiceEvent::eType service_event,
-    utils::Optional<hmi_apis::Common_ServiceUpdateReason::eType>
+    utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>
         service_update_reason) {
   LOG4CXX_AUTO_TRACE(logger_);
 
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index dee157d92c..e98deab2d2 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -2264,7 +2264,7 @@ MessageHelper::ServiceStatusUpdateNotificationBuilder::AddAppID(
 
 MessageHelper::ServiceStatusUpdateNotificationBuilder&
 MessageHelper::ServiceStatusUpdateNotificationBuilder::AddServiceUpdateReason(
-    const ServiceUpdateReason service_update_reason) {
+    const ServiceStatusUpdateReason service_update_reason) {
   (*notification_)[strings::msg_params][hmi_notification::reason] =
       service_update_reason;
 
diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc
index cc6c1418c4..f3297388ff 100644
--- a/src/components/application_manager/test/application_manager_impl_test.cc
+++ b/src/components/application_manager/test/application_manager_impl_test.cc
@@ -107,10 +107,11 @@ const WindowID kDefaultWindowId =
 
 typedef MockMessageHelper::MockServiceStatusUpdateNotificationBuilder*
     MockServiceStatusUpdatePtr;
-typedef hmi_apis::Common_ServiceUpdateReason::eType ServiceUpdateReason;
+typedef hmi_apis::Common_ServiceStatusUpdateReason::eType
+    ServiceStatusUpdateReason;
 typedef hmi_apis::Common_ServiceType::eType ServiceType;
 typedef hmi_apis::Common_ServiceEvent::eType ServiceEvent;
-typedef utils::Optional<ServiceUpdateReason> UpdateReasonOptional;
+typedef utils::Optional<ServiceStatusUpdateReason> UpdateReasonOptional;
 
 #if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
 // Cloud application params
@@ -177,11 +178,7 @@ class ApplicationManagerImplTest
         .WillByDefault(DoAll(SetArgPointee<3u>(app_id_), Return(0)));
     ON_CALL(mock_connection_handler_, get_session_observer())
         .WillByDefault(ReturnRef(mock_session_observer_));
-    std::unique_ptr<rpc_service::RPCService> unique_rpc_service(
-        new MockRPCService);
-    app_manager_impl_->SetRPCService(unique_rpc_service);
-    mock_rpc_service_ =
-        static_cast<MockRPCService*>(&(app_manager_impl_->GetRPCService()));
+
     app_manager_impl_->SetMockRPCService(mock_rpc_service_);
     app_manager_impl_->resume_controller().set_resumption_storage(
         mock_storage_);
@@ -326,8 +323,9 @@ INSTANTIATE_TEST_CASE_P(
 
 TEST_P(ApplicationManagerImplTest,
        ProcessServiceStatusUpdate_SendMessageToHMI) {
-  smart_objects::SmartObjectSPtr notification_(
-      new smart_objects::SmartObject(smart_objects::SmartType_Map));
+  smart_objects::SmartObjectSPtr notification_ =
+      std::make_shared<smart_objects::SmartObject>(
+          smart_objects::SmartType_Map);
   (*notification_)[strings::msg_params][hmi_notification::service_type] =
       GetParam().service_type_;
   (*notification_)[strings::msg_params][hmi_notification::service_event] =
@@ -347,7 +345,7 @@ TEST_P(ApplicationManagerImplTest,
   ON_CALL(*mock_service_status_update_, notification())
       .WillByDefault(Return(notification_));
 
-  EXPECT_CALL(*mock_rpc_service_, ManageHMICommand(notification_))
+  EXPECT_CALL(*mock_rpc_service_, ManageHMICommand(notification_, _))
       .WillOnce(Return(true));
 
   app_manager_impl_->ProcessServiceStatusUpdate(kConnectionKey,
diff --git a/src/components/application_manager/test/help_prompt_manager_test.cc b/src/components/application_manager/test/help_prompt_manager_test.cc
index 502c1bdbbf..1a719012a8 100644
--- a/src/components/application_manager/test/help_prompt_manager_test.cc
+++ b/src/components/application_manager/test/help_prompt_manager_test.cc
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2018, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
index 21c88fbabc..e74e43df01 100644
--- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h
+++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
@@ -356,7 +356,7 @@ class MockMessageHelper {
                    const uint32_t app_id,
                    const hmi_apis::Common_ServiceType::eType service_type,
                    const hmi_apis::Common_ServiceEvent::eType service_event,
-                   const hmi_apis::Common_ServiceUpdateReason::eType
+                   const hmi_apis::Common_ServiceStatusUpdateReason::eType
                        service_update_reason));
 
   class MockServiceStatusUpdateNotificationBuilder
@@ -376,7 +376,7 @@ class MockMessageHelper {
 
     MOCK_METHOD1(AddServiceUpdateReason,
                  MessageHelper::ServiceStatusUpdateNotificationBuilder&(
-                     const hmi_apis::Common_ServiceUpdateReason::eType));
+                     const hmi_apis::Common_ServiceStatusUpdateReason::eType));
 
     MOCK_CONST_METHOD0(notification, smart_objects::SmartObjectSPtr());
   };
diff --git a/src/components/application_manager/test/message_helper/message_helper_test.cc b/src/components/application_manager/test/message_helper/message_helper_test.cc
index 966548d707..8d75cacdf3 100644
--- a/src/components/application_manager/test/message_helper/message_helper_test.cc
+++ b/src/components/application_manager/test/message_helper/message_helper_test.cc
@@ -74,7 +74,7 @@ typedef MessageHelper::ServiceStatusUpdateNotificationBuilder::ServiceType
 typedef MessageHelper::ServiceStatusUpdateNotificationBuilder::ServiceEvent
     ServiceEvent;
 typedef MessageHelper::ServiceStatusUpdateNotificationBuilder::
-    ServiceUpdateReason UpdateReason;
+    ServiceStatusUpdateReason UpdateReason;
 typedef MessageHelper::ServiceStatusUpdateNotificationBuilder
     ServiceStatusUpdateBuilder;
 
diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc
index 50fcdd4692..c11261fe88 100755
--- a/src/components/application_manager/test/mock_message_helper.cc
+++ b/src/components/application_manager/test/mock_message_helper.cc
@@ -625,7 +625,8 @@ MessageHelper::ServiceStatusUpdateNotificationBuilder::AddAppID(
 
 MessageHelper::ServiceStatusUpdateNotificationBuilder&
 MessageHelper::ServiceStatusUpdateNotificationBuilder::AddServiceUpdateReason(
-    const hmi_apis::Common_ServiceUpdateReason::eType service_update_reason) {
+    const hmi_apis::Common_ServiceStatusUpdateReason::eType
+        service_update_reason) {
   return MockMessageHelper::on_service_update_builder_mock()
       ->AddServiceUpdateReason(service_update_reason);
 }
diff --git a/src/components/application_manager/test/policy_event_observer_test.cc b/src/components/application_manager/test/policy_event_observer_test.cc
index a425dfe44f..a74b12071c 100644
--- a/src/components/application_manager/test/policy_event_observer_test.cc
+++ b/src/components/application_manager/test/policy_event_observer_test.cc
@@ -38,10 +38,6 @@
 #include "policy/policy_types.h"
 #include "smart_objects/smart_object.h"
 
-#ifdef EXTERNAL_PROPRIETARY_MODE
-#include "policy/ptu_retry_handler.h"
-#endif
-
 namespace test {
 namespace components {
 namespace policy_test {
diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h
index ae18779c03..6c08dbcb0b 100644
--- a/src/components/include/application_manager/policies/policy_handler_interface.h
+++ b/src/components/include/application_manager/policies/policy_handler_interface.h
@@ -52,6 +52,10 @@
 #include "smart_objects/smart_object.h"
 #include "utils/callable.h"
 #include "utils/custom_string.h"
+#include "utils/optional.h"
+#ifdef EXTERNAL_PROPRIETARY_MODE
+#include "policy/ptu_retry_handler.h"
+#endif  // EXTERNAL_PROPRIETARY_MODE
 
 using namespace ::rpc::policy_table_interface_base;
 namespace policy {
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index 54cf2c1435..717ddb04f3 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -402,7 +402,7 @@
   <element name="STOP">
     <description>Indicates that a button press of the Play/Pause button would stop the current playback.</description>
   </element>
-</enum> 
+</enum>
 
 <enum name="SystemContext">
   <description>Enumeration that describes possible contexts the application might be in on HU.</description>
@@ -3486,7 +3486,6 @@
       </param>
   </struct>
 
-
   <struct name="RemoteControlCapabilities">
     <param name="climateControlCapabilities" type="ClimateControlCapabilities" mandatory="false" minsize="1" maxsize="100" array="true">
       <description>If included, the platform supports RC climate controls. For this baseline version, maxsize=1. i.e. only one climate control module is supported.</description >
@@ -3537,10 +3536,10 @@
       <description>The position of the haptic rectangle to be highlighted. The center of this rectangle will be "touched" when a press occurs.</description>
     </param>
   </struct>
-    
+
   <struct name="SyncMsgVersion">
         <description>Specifies the version number of the SmartDeviceLink protocol that is supported by the mobile application or app service</description>
-        
+
         <param name="majorVersion" type="Integer" minvalue="1" maxvalue="10" mandatory="true">
             <description>The major version indicates versions that is not-compatible to previous versions.</description>
         </param>
@@ -3561,7 +3560,7 @@
     </element>
     <element name="RPC" >
       <description>Refers to the RPC service.</description>
-    </element>	  
+    </element>
   </enum>
 
   <enum name="ServiceEvent">
@@ -3570,23 +3569,23 @@
     </element>
     <element name="REQUEST_ACCEPTED" >
       <description>When a request for a Service is Accepted.</description>
-    </element>			
+    </element>
     <element name="REQUEST_REJECTED" >
       <description>When a request for a Service is Rejected.</description>
-    </element>			
-  </enum>	
+    </element>
+  </enum>
 
-  <enum name="ServiceUpdateReason">
+  <enum name="ServiceStatusUpdateReason">
     <element name="PTU_FAILED" >
       <description>When a Service is rejected because the system was unable to get a required Policy Table Update.</description>
     </element>
     <element name="INVALID_CERT" >
       <description>When a Service is rejected because the security certificate is invalid/expired.</description>
-    </element>			
+    </element>
     <element name="INVALID_TIME" >
       <description>When a Service is rejected because the system was unable to get a valid SystemTime from HMI, which is required for certificate authentication.</description>
-    </element>			
-  </enum>	
+    </element>
+  </enum>
 
     <!-- App Services -->
 
@@ -3730,7 +3729,7 @@
         <param name="apparentTemperature" type="Common.Temperature" mandatory="false"/>
         <param name="apparentTemperatureHigh" type="Common.Temperature" mandatory="false"/>
         <param name="apparentTemperatureLow" type="Common.Temperature" mandatory="false"/>
-    
+
         <param name="weatherSummary" type="String" mandatory="false"/>
         <param name="time" type="Common.DateTime" mandatory="false"/>
         <param name="humidity" type="Float" minvalue="0" maxvalue="1" mandatory="false">
@@ -3801,7 +3800,7 @@
             <description> Using this action plus a supplied direction can give the type of turn. </description>
         </element>
         <element name="EXIT"/>
-        <element name="STAY"/>    
+        <element name="STAY"/>
         <element name="MERGE"/>
         <element name="FERRY"/>
         <element name="CAR_SHUTTLE_TRAIN"/>
@@ -4133,14 +4132,14 @@
   <param name="serviceEvent" type="Common.ServiceEvent" mandatory="false">
     <description>Specifies service update event.</description>
   </param>
-  <param name="reason" type="Common.ServiceUpdateReason" mandatory="false">
+  <param name="reason" type="Common.ServiceStatusUpdateReason" mandatory="false">
     <description>
       The reason for a service event. Certain events may not have a reason, such as when a service is ACCEPTED (which is the normal expected behavior).
     </description>
   </param>
    <param name="appID" type="Integer" mandatory="false">
        <description>ID of the application which triggered the update.</description>
-   </param>	
+   </param>
 </function>
     <function name="GetSystemTime" messagetype="request">
       <description>Request from SDL to HMI to obtain current UTC time.</description>
@@ -4492,7 +4491,7 @@
       <description>Selected file type.</description>
     </param>
   </function>
-  
+
 <!-- Policies -->
   <function name="GetSystemInfo" messagetype="request">
     <description>Request from SDL to HMI to obtain information about head unit system.</description>
@@ -5338,7 +5337,6 @@
   </function>
   <function name="SetAppIcon" messagetype="response">
   </function>
-
   <function name="ShowCustomForm" messagetype="request">
     <description>Used to show a custom form; it can be a parent or child screen. If no parent screen is designated, it is set as a parent screen.</description>
     <param name="customFormID" type="String" maxlength="500" mandatory="true">
@@ -6823,18 +6821,18 @@
 
     <function name="GetAppServiceData" messagetype="request">
         <description> This request asks the module for current data related to the specific service. It also includes an option to subscribe to that service for future updates</description>
-        
+
         <param name="serviceType" type="String" mandatory="true">
             <description>The type of service that is to be offered by this app. See AppServiceType for known enum equivalent types. Parameter is a string to allow for new service types to be used by apps on older versions of SDL Core.</description>
         </param>
-        
+
         <param name="subscribe" type="Boolean" mandatory="false">
             <description> If true, the consumer is requesting to subscribe to all future updates from the service publisher. If false, the consumer doesn't wish to subscribe and should be unsubscribed if it was previously subscribed.</description>
-        </param>      
+        </param>
     </function>
 
     <function name="GetAppServiceData" messagetype="response">
-        <description> This response includes the data that was requested from the specific service</description>    
+        <description> This response includes the data that was requested from the specific service</description>
         <param name="serviceData" type="Common.AppServiceData" mandatory="false"/>
     </function>
 
@@ -6842,15 +6840,15 @@
         <param name="serviceUri" type="String"  mandatory="true">
             <description>Fully qualified URI based on a predetermined scheme provided by the app service. SDL makes no guarantee that this URI is correct.</description>
         </param>
-        
+
         <param name="serviceID" type="String" mandatory="true">
             <description>The service ID that the app consumer wishes to send this URI.</description>
         </param>
-        
+
         <param name="originApp" type="String" mandatory="false">
             <description>This string is the appID of the app requesting the app service provider take the specific action. This will automatically be set by SDL Core in requests originating from the HMI</description>
         </param>
-        
+
         <param name="requestServiceActive" type="Boolean" mandatory="false">
             <description>This flag signals the requesting consumer would like this service to become the active primary service of the destination's type.</description>
         </param>
@@ -6895,7 +6893,7 @@
         </param>
         <param name="setAsDefault" type="Boolean" mandatory="false">
             <description>True if the service was set to the default service of this type. False if the app was not to be the default</description>
-        </param> 
+        </param>
     </function>
 
     <function name="GetActiveServiceConsent" messagetype="request">
@@ -6906,7 +6904,7 @@
             <description>The ID of the service to be activated</description>
         </param>
     </function>
-    
+
     <function name="GetActiveServiceConsent" messagetype="response">
         <param name="activate" type="Boolean" mandatory="true">
             <description>
diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc
index 33b862e2df..cc3b03e2d9 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -52,7 +52,6 @@
 
 #include "policy/access_remote.h"
 #include "policy/access_remote_impl.h"
-#include "policy/ptu_retry_handler.h"
 #include "utils/timer_task_impl.h"
 
 __attribute__((visibility("default"))) policy::PolicyManager* CreateManager() {
diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
index 336ed1f338..e3b75f805a 100644
--- a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
+++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
@@ -468,6 +468,8 @@ class ProtocolHandlerImpl
   }
 #endif
 
+  void OnAuthTokenUpdated(const std::string&, const std::string&) OVERRIDE;
+
  private:
   void SendEndServicePrivate(int32_t primary_connection_id,
                              int32_t connection_id,
@@ -545,6 +547,10 @@ class ProtocolHandlerImpl
       const transport_manager::ConnectionUID connection_id,
       const transport_manager::CommunicationError& error) OVERRIDE;
 
+  void OnConnectionPending(
+      const transport_manager::DeviceInfo& device_info,
+      const transport_manager::ConnectionUID connection_id) OVERRIDE;
+
   /**
    * @brief Notifies that configuration of a transport has been updated.
    *
diff --git a/src/components/protocol_handler/include/protocol_handler/service_status_update_handler_listener.h b/src/components/protocol_handler/include/protocol_handler/service_status_update_handler_listener.h
index e784ae6eb6..3c782f72f8 100644
--- a/src/components/protocol_handler/include/protocol_handler/service_status_update_handler_listener.h
+++ b/src/components/protocol_handler/include/protocol_handler/service_status_update_handler_listener.h
@@ -68,7 +68,7 @@ class ServiceStatusUpdateHandlerListener {
       const uint32_t connection_key,
       hmi_apis::Common_ServiceType::eType service_type,
       hmi_apis::Common_ServiceEvent::eType service_event,
-      utils::Optional<hmi_apis::Common_ServiceUpdateReason::eType>
+      utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>
           service_update_reason) = 0;
 };
 
diff --git a/src/components/protocol_handler/src/service_status_update_handler.cc b/src/components/protocol_handler/src/service_status_update_handler.cc
index 27eb679099..e81f59677d 100644
--- a/src/components/protocol_handler/src/service_status_update_handler.cc
+++ b/src/components/protocol_handler/src/service_status_update_handler.cc
@@ -28,7 +28,7 @@ void ServiceStatusUpdateHandler::OnServiceUpdate(
     const protocol_handler::ServiceType service_type,
     ServiceStatus service_status) {
   using namespace hmi_apis;
-  typedef utils::Optional<Common_ServiceUpdateReason::eType>
+  typedef utils::Optional<Common_ServiceStatusUpdateReason::eType>
       UpdateReasonOptional;
   auto hmi_service_type = GetHMIServiceType(service_type);
 
@@ -55,7 +55,7 @@ void ServiceStatusUpdateHandler::OnServiceUpdate(
           UpdateReasonOptional(UpdateReasonOptional::EMPTY));
     }
     case ServiceStatus::PTU_FAILED: {
-      auto update_reason = Common_ServiceUpdateReason::PTU_FAILED;
+      auto update_reason = Common_ServiceStatusUpdateReason::PTU_FAILED;
       return listener_->ProcessServiceStatusUpdate(
           connection_key,
           hmi_service_type,
@@ -63,7 +63,7 @@ void ServiceStatusUpdateHandler::OnServiceUpdate(
           update_reason);
     }
     case ServiceStatus::CERT_INVALID: {
-      auto update_reason = Common_ServiceUpdateReason::INVALID_CERT;
+      auto update_reason = Common_ServiceStatusUpdateReason::INVALID_CERT;
       return listener_->ProcessServiceStatusUpdate(
           connection_key,
           hmi_service_type,
@@ -71,7 +71,7 @@ void ServiceStatusUpdateHandler::OnServiceUpdate(
           update_reason);
     }
     case ServiceStatus::INVALID_TIME: {
-      auto update_reason = Common_ServiceUpdateReason::INVALID_TIME;
+      auto update_reason = Common_ServiceStatusUpdateReason::INVALID_TIME;
       return listener_->ProcessServiceStatusUpdate(
           connection_key,
           hmi_service_type,
diff --git a/src/components/protocol_handler/test/include/protocol_handler/mock_service_status_update_handler_listener.h b/src/components/protocol_handler/test/include/protocol_handler/mock_service_status_update_handler_listener.h
index 37485aa3ac..ccbfeb8438 100644
--- a/src/components/protocol_handler/test/include/protocol_handler/mock_service_status_update_handler_listener.h
+++ b/src/components/protocol_handler/test/include/protocol_handler/mock_service_status_update_handler_listener.h
@@ -48,7 +48,7 @@ class MockServiceStatusUpdateHandlerListener
       void(const uint32_t,
            hmi_apis::Common_ServiceType::eType,
            hmi_apis::Common_ServiceEvent::eType,
-           utils::Optional<hmi_apis::Common_ServiceUpdateReason::eType>));
+           utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>));
 };
 }  // namespace protocol_handler_test
 }  // namespace components
diff --git a/src/components/protocol_handler/test/service_status_update_handler_test.cc b/src/components/protocol_handler/test/service_status_update_handler_test.cc
index fa64ffbb3b..b587194d98 100644
--- a/src/components/protocol_handler/test/service_status_update_handler_test.cc
+++ b/src/components/protocol_handler/test/service_status_update_handler_test.cc
@@ -46,7 +46,8 @@ using namespace protocol_handler;
 using ::testing::_;
 using ::testing::Return;
 using namespace hmi_apis;
-typedef utils::Optional<Common_ServiceUpdateReason::eType> UpdateReasonOptional;
+typedef utils::Optional<Common_ServiceStatusUpdateReason::eType>
+    UpdateReasonOptional;
 typedef std::shared_ptr<ServiceStatusUpdateHandler>
     ServiceStatusUpdateHandlerPtr;
 typedef std::shared_ptr<MockServiceStatusUpdateHandlerListener>
@@ -96,19 +97,19 @@ class ServiceStatusUpdateHandlerTest
         return UpdateReasonOptional::EMPTY;
       }
       case ServiceStatus::PTU_FAILED: {
-        auto reason = Common_ServiceUpdateReason::PTU_FAILED;
+        auto reason = Common_ServiceStatusUpdateReason::PTU_FAILED;
         return reason;
       }
       case ServiceStatus::CERT_INVALID: {
-        auto reason = Common_ServiceUpdateReason::INVALID_CERT;
+        auto reason = Common_ServiceStatusUpdateReason::INVALID_CERT;
         return reason;
       }
       case ServiceStatus::INVALID_TIME: {
-        auto reason = Common_ServiceUpdateReason::INVALID_TIME;
+        auto reason = Common_ServiceStatusUpdateReason::INVALID_TIME;
         return reason;
       }
       default: {
-        auto reason = Common_ServiceUpdateReason::INVALID_ENUM;
+        auto reason = Common_ServiceStatusUpdateReason::INVALID_ENUM;
         return reason;
       }
     }