A bit more cleanup.

Author: andy31415

src/app/clusters/general-commissioning-server/general-commissioning-cluster.h

@@ -29,6 +29,7 @@
 #include <credentials/FabricTable.h>
 #include <lib/support/BitFlags.h>
 #include <platform/ConfigurationManager.h>
+#include <platform/DeviceControlServer.h>
 #include <platform/PlatformManager.h>
 
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED

src/app/clusters/general-commissioning-server/tests/TestGeneralCommissioningCluster.cpp

@@ -49,8 +49,10 @@ struct TestGeneralCommissioningCluster : public ::testing::Test
     static void TearDownTestSuite() { chip::Platform::MemoryShutdown(); }
 };
 
-GeneralCommissioningCluster::Context CreateStandardContext() {
-    return {
+GeneralCommissioningCluster::Context CreateStandardContext()
+{
+    return
+    {
         .commissioningWindowManager = Server::GetInstance().GetCommissioningWindowManager(), //
             .configurationManager   = DeviceLayer::ConfigurationMgr(),                       //
             .deviceControlServer    = DeviceLayer::DeviceControlServer::DeviceControlSvr(),  //

src/app/clusters/thread-border-router-management-server/thread-border-router-management-server.cpp

@@ -29,7 +29,6 @@
 #include <app/InteractionModelEngine.h>
 #include <app/MessageDef/StatusIB.h>
 #include <app/clusters/general-commissioning-server/CodegenIntegration.h>
-#include <app/clusters/general-commissioning-server/general-commissioning-cluster.h>
 #include <app/data-model/Nullable.h>
 #include <lib/core/CHIPError.h>
 #include <lib/core/Optional.h>