further review comments

3 files changed, 6 insertions, 6 deletions

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 7b12cb541e..e43722aa6a 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
@@ -54,7 +54,7 @@
 #include "utils/stl_utils.h"
 #include "utils/rwlock.h"
 
-#define DISABLED_SECONDARY 0xFFFFFFFF
+const transport_manager::ConnectionUID kDisabledSecondary = 0xFFFFFFFF;
 
 /**
  * \namespace connection_handler
diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc
index a2883c9137..8af0d85edf 100644
--- a/src/components/connection_handler/src/connection_handler_impl.cc
+++ b/src/components/connection_handler/src/connection_handler_impl.cc
@@ -1026,11 +1026,11 @@ SessionTransports ConnectionHandlerImpl::SetSecondaryTransportID(
     st = it->second;
 
     // The only time we overwrite an existing entry in the map is if the new
-    // secondary transport ID is DISABLED_SECONDARY, which effectively DISABLES
+    // secondary transport ID is kDisabledSecondary, which effectively DISABLES
     // the secondary transport feature for the session, or if the new secondary
     // transport ID is 0, which means a secondary transport has shut down
     if (st.secondary_transport != 0 &&
-        secondary_transport_id != DISABLED_SECONDARY &&
+        secondary_transport_id != kDisabledSecondary &&
         secondary_transport_id != 0) {
       LOG4CXX_WARN(logger_,
                    "SetSecondaryTransportID: session ID "
diff --git a/src/components/connection_handler/test/connection_handler_impl_test.cc b/src/components/connection_handler/test/connection_handler_impl_test.cc
index 9ea5bf8637..f88276f7e3 100644
--- a/src/components/connection_handler/test/connection_handler_impl_test.cc
+++ b/src/components/connection_handler/test/connection_handler_impl_test.cc
@@ -2120,8 +2120,8 @@ TEST_F(ConnectionHandlerTest, StopSecondarySession_NoService) {
   // session ID even if we don't have any services
   EXPECT_CALL(mock_connection_handler_observer,
               OnSecondaryTransportEndedCallback(_));
-  EXPECT_CALL(mock_connection_handler_observer,

-              OnServiceEndedCallback(_, _, _)).Times(0);
+  EXPECT_CALL(mock_connection_handler_observer, OnServiceEndedCallback(_, _, _))
+      .Times(0);
 
   connection_handler_->OnSecondaryTransportEnded(uid_, secondary_uid);
 
@@ -2203,7 +2203,7 @@ TEST_F(ConnectionHandlerTest, SetSecondaryTransportID_OverwirteSecondaryUID) {
     session_connection_map[session_id] = st;
   }
 
-  secondary_uid = DISABLED_SECONDARY;
+  secondary_uid = kDisabledSecondary;
   SessionTransports st =
       connection_handler_->SetSecondaryTransportID(session_id, secondary_uid);
   EXPECT_EQ(primary_uid, st.primary_transport);