From 6b3368fdc33c07fdb2f11ae4cf2e8936d7cbd507 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Wed, 27 Apr 2022 10:01:45 -0400
Subject: [PATCH] Remove some unnecessary nullable annotations. (#17799)

Just need to initialize things in the initializer list instead of
default-constructing them as nil and then initializing them.
---
 .../Framework/CHIP/CHIPPersistentStorageDelegateBridge.h      | 4 ++--
 .../Framework/CHIP/CHIPPersistentStorageDelegateBridge.mm     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegateBridge.h b/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegateBridge.h
index 395ba3cdf44186..a497500129ce24 100644
--- a/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegateBridge.h
+++ b/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegateBridge.h
@@ -35,8 +35,8 @@ class CHIPPersistentStorageDelegateBridge : public chip::PersistentStorageDelega
     CHIP_ERROR SyncDeleteKeyValue(const char * key) override;
 
 private:
-    _Nullable id<CHIPPersistentStorageDelegate> mDelegate;
-    _Nullable dispatch_queue_t mWorkQueue;
+    id<CHIPPersistentStorageDelegate> mDelegate;
+    dispatch_queue_t mWorkQueue;
 };
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegateBridge.mm b/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegateBridge.mm
index ccd7e2b0af0d33..7e7dcaf8289526 100644
--- a/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegateBridge.mm
+++ b/src/darwin/Framework/CHIP/CHIPPersistentStorageDelegateBridge.mm
@@ -53,8 +53,8 @@
 
 CHIPPersistentStorageDelegateBridge::CHIPPersistentStorageDelegateBridge(id<CHIPPersistentStorageDelegate> delegate)
     : mDelegate(delegate)
+    , mWorkQueue(dispatch_queue_create("com.zigbee.chip.framework.storage.workqueue", DISPATCH_QUEUE_SERIAL))
 {
-    mWorkQueue = dispatch_queue_create("com.zigbee.chip.framework.storage.workqueue", DISPATCH_QUEUE_SERIAL);
 }
 
 CHIPPersistentStorageDelegateBridge::~CHIPPersistentStorageDelegateBridge(void) {}