From c77f14553854abd6cbcc0df9a24a326b6624d669 Mon Sep 17 00:00:00 2001
From: jepenven-silabs <jean-francois.penven@silabs.com>
Date: Tue, 8 Mar 2022 12:48:22 -0500
Subject: [PATCH] fix ci and last comments

---
 src/controller/CHIPDeviceControllerFactory.cpp | 6 ++++--
 src/credentials/FabricTable.h                  | 2 +-
 src/credentials/GroupDataProvider.h            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/controller/CHIPDeviceControllerFactory.cpp b/src/controller/CHIPDeviceControllerFactory.cpp
index cd7551262aa118..4fc754997f3ee4 100644
--- a/src/controller/CHIPDeviceControllerFactory.cpp
+++ b/src/controller/CHIPDeviceControllerFactory.cpp
@@ -145,8 +145,10 @@ CHIP_ERROR DeviceControllerFactory::InitSystemState(FactoryInitParams params)
     stateParams.messageCounterManager = chip::Platform::New<secure_channel::MessageCounterManager>();
 
     ReturnErrorOnFailure(stateParams.fabricTable->Init(params.fabricIndependentStorage));
-    ReturnErrorOnFailure(
-        stateParams.fabricTable->AddFabricDelegate(chip::Platform::New<ControllerFabricDelegate>(stateParams.sessionMgr)));
+
+    auto delegate = chip::Platform::MakeUnique<ControllerFabricDelegate>(stateParams.sessionMgr);
+    ReturnErrorOnFailure(stateParams.fabricTable->AddFabricDelegate(delegate.get()));
+    delegate.release();
 
     ReturnErrorOnFailure(stateParams.sessionMgr->Init(stateParams.systemLayer, stateParams.transportMgr,
                                                       stateParams.messageCounterManager, params.fabricIndependentStorage,
diff --git a/src/credentials/FabricTable.h b/src/credentials/FabricTable.h
index 8c8dbd8c760eb9..8a9ea3b4d3b813 100644
--- a/src/credentials/FabricTable.h
+++ b/src/credentials/FabricTable.h
@@ -274,7 +274,7 @@ class DLL_EXPORT FabricTableDelegate
     friend class FabricTable;
 
 public:
-    FabricTableDelegate(bool selfOwned = false) : mOwnedByFabricTable(selfOwned) {}
+    FabricTableDelegate(bool ownedByFabricTable = false) : mOwnedByFabricTable(ownedByFabricTable) {}
     virtual ~FabricTableDelegate() {}
     /**
      * Gets called when a fabric is deleted from KVS store.
diff --git a/src/credentials/GroupDataProvider.h b/src/credentials/GroupDataProvider.h
index 8ae5a80f947417..3bc44a84f85fe8 100644
--- a/src/credentials/GroupDataProvider.h
+++ b/src/credentials/GroupDataProvider.h
@@ -166,7 +166,7 @@ class GroupDataProvider
         /**
          *  Callback invoked when an existing group is removed.
          *
-         *  @param[in] removed_state  GroupInfo structure of the removed group.
+         *  @param[in] old_group  GroupInfo structure of the removed group.
          */
         virtual void OnGroupRemoved(FabricIndex fabric_index, const GroupInfo & old_group) = 0;
     };