Fix style issues

6 files changed, 11 insertions, 10 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h
index 38c65a3d90..765be658f6 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h
@@ -69,7 +69,7 @@ class GetUrls : public RequestFromHMI {
    * @param endpoints Endpoints section of policy table
    */
   void ProcessPolicyServiceURLs(const policy::EndpointUrls& endpoints);
-#endif  //EXTENDED_POLICY
+#endif  // EXTENDED_POLICY
 
   /**
    * @brief Process URLs collecting for service
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h
index 4613fef548..957c9ebd43 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h
@@ -74,7 +74,7 @@ class OnSystemRequestNotification : public CommandNotificationImpl {
    */
   void AddHeader(BinaryMessage& message) const;
   size_t ParsePTString(std::string& pt_string) const;
-#endif  //EXTENDED_POLICY
+#endif  // EXTENDED_POLICY
 
   DISALLOW_COPY_AND_ASSIGN(OnSystemRequestNotification);
 };
diff --git a/src/components/application_manager/src/commands/hmi/get_urls.cc b/src/components/application_manager/src/commands/hmi/get_urls.cc
index 3ac46a74d8..3a6e074d6b 100644
--- a/src/components/application_manager/src/commands/hmi/get_urls.cc
+++ b/src/components/application_manager/src/commands/hmi/get_urls.cc
@@ -74,7 +74,7 @@ void GetUrls::Run() {
     ProcessPolicyServiceURLs(endpoints);
     return;
   }
-#endif  //EXTENDED_POLICY
+#endif  // EXTENDED_POLICY
 
   ProcessServiceURLs(endpoints);
 }
@@ -219,7 +219,7 @@ void GetUrls::ProcessPolicyServiceURLs(const policy::EndpointUrls& endpoints) {
   SendResponseToHMI(Common_Result::SUCCESS);
   return;
 }
-#endif  //EXTENDED_POLICY
+#endif  // EXTENDED_POLICY
 
 }  // namespace commands
 }  // namespace application_manager
diff --git a/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc b/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc
index 9d19ef765c..3b7142fa46 100644
--- a/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc
+++ b/src/components/application_manager/src/commands/mobile/on_system_request_notification.cc
@@ -92,7 +92,7 @@ void OnSystemRequestNotification::Run() {
     file_system::ReadBinaryFile(filename, binary_data);
     AddHeader(binary_data);
     (*message_)[strings::params][strings::binary_data] = binary_data;
-#endif //EXTENDED_POLICY
+#endif  // EXTENDED_POLICY
     (*message_)[strings::msg_params][strings::file_type] = FileType::JSON;
   } else if (RequestType::HTTP == request_type) {
     (*message_)[strings::msg_params][strings::file_type] = FileType::BINARY;
@@ -184,7 +184,7 @@ size_t OnSystemRequestNotification::ParsePTString(
   pt_string = result;
   return result_length;
 }
-#endif  //EXTENDED_POLICY
+#endif  // EXTENDED_POLICY
 
 }  // namespace mobile
 
diff --git a/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc
index 3548dfe445..b436a12787 100644
--- a/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc
@@ -105,7 +105,7 @@ TEST_F(OnSystemRequestNotificationTest, Run_ProprietaryType_SUCCESS) {
       .Times(2)
       .WillRepeatedly(ReturnRef(mock_policy_handler));
   EXPECT_CALL(mock_policy_handler, TimeoutExchange()).WillOnce(Return(5u));
-#endif // EXTENDED_POLICY || EXTENDED_PROPRIETARY
+#endif  // EXTENDED_POLICY || EXTENDED_PROPRIETARY
 
   EXPECT_CALL(message_helper_, PrintSmartObject(_)).WillOnce(Return(false));
   EXPECT_CALL(app_mngr_, SendMessageToMobile(msg, _));
diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc
index bd3ef80634..b045f4b924 100644
--- a/src/components/application_manager/test/policy_handler_test.cc
+++ b/src/components/application_manager/test/policy_handler_test.cc
@@ -1309,13 +1309,14 @@ TEST_F(PolicyHandlerTest, OnSnapshotCreated_UrlAdded) {
 
   ExtendedPolicyExpectations();
 
-  EXPECT_CALL(*MockMessageHelper::message_helper_mock(), SendPolicySnapshotNotification(_, _, _, _));
+  EXPECT_CALL(*MockMessageHelper::message_helper_mock(),
+              SendPolicySnapshotNotification(_, _, _, _));
   EXPECT_CALL(app_manager_, application(kAppId_))
       .WillRepeatedly(Return(mock_app_));
 
   policy_handler_.OnSnapshotCreated(msg, retry_delay_seconds, timeout_exchange);
 }
-#else //EXTENDED_PROPRIETARY
+#else  // EXTENDED_PROPRIETARY
 TEST_F(PolicyHandlerTest, OnSnapshotCreated_UrlAdded) {
   EnablePolicyAndPolicyManagerMock();
   BinaryMessage msg;
@@ -1346,7 +1347,7 @@ TEST_F(PolicyHandlerTest, OnSnapshotCreated_UrlAdded) {
 
   policy_handler_.OnSnapshotCreated(msg);
 }
-#endif // EXTENDED_PROPRIETARY
+#endif  // EXTENDED_PROPRIETARY
 
 TEST_F(PolicyHandlerTest,
        OnAllowSDLFunctionalityNotification_Allowed_WithoutDevId_AppActivated) {