Add a HARD_ASSERT C++ assertion macro (#1304)

* Add HARD_ASSERT
* Use HARD_ASSERT
* Remove FIREBASE_ASSERT
* Remove StringPrintf

3 files changed, 11 insertions, 13 deletions

diff --git a/Firestore/core/src/firebase/firestore/auth/firebase_credentials_provider_apple.mm b/Firestore/core/src/firebase/firestore/auth/firebase_credentials_provider_apple.mm
index ff2d5f7..9d5b89e 100644
--- a/Firestore/core/src/firebase/firestore/auth/firebase_credentials_provider_apple.mm
+++ b/Firestore/core/src/firebase/firestore/auth/firebase_credentials_provider_apple.mm
@@ -20,7 +20,7 @@
 #import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseCore/FIROptionsInternal.h>
 
-#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
+#include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
 #include "Firestore/core/src/firebase/firestore/util/string_apple.h"
 
 // NB: This is also defined in Firestore/Source/Public/FIRFirestoreErrors.h
@@ -80,8 +80,8 @@ FirebaseCredentialsProvider::~FirebaseCredentialsProvider() {
 
 void FirebaseCredentialsProvider::GetToken(bool force_refresh,
                                            TokenListener completion) {
-  FIREBASE_ASSERT_MESSAGE(auth_listener_handle_,
-                          "GetToken cannot be called after listener removed.");
+  HARD_ASSERT(auth_listener_handle_,
+              "GetToken cannot be called after listener removed.");
 
   // Take note of the current value of the userCounter so that this method can
   // fail if there is a user change while the request is outstanding.
@@ -129,15 +129,13 @@ void FirebaseCredentialsProvider::SetUserChangeListener(
     UserChangeListener listener) {
   std::unique_lock<std::mutex> lock(contents_->mutex);
   if (listener) {
-    FIREBASE_ASSERT_MESSAGE(!user_change_listener_,
-                            "set user_change_listener twice!");
+    HARD_ASSERT(!user_change_listener_, "set user_change_listener twice!");
     // Fire initial event.
     listener(contents_->current_user);
   } else {
-    FIREBASE_ASSERT_MESSAGE(auth_listener_handle_,
-                            "removed user_change_listener twice!");
-    FIREBASE_ASSERT_MESSAGE(user_change_listener_,
-                            "user_change_listener removed without being set!");
+    HARD_ASSERT(auth_listener_handle_, "removed user_change_listener twice!");
+    HARD_ASSERT(user_change_listener_,
+                "user_change_listener removed without being set!");
     [[NSNotificationCenter defaultCenter] removeObserver:auth_listener_handle_];
     auth_listener_handle_ = nil;
   }
diff --git a/Firestore/core/src/firebase/firestore/auth/token.h b/Firestore/core/src/firebase/firestore/auth/token.h
index 56084f8..b0d7075 100644
--- a/Firestore/core/src/firebase/firestore/auth/token.h
+++ b/Firestore/core/src/firebase/firestore/auth/token.h
@@ -20,7 +20,7 @@
 #include <string>
 
 #include "Firestore/core/src/firebase/firestore/auth/user.h"
-#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
+#include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
 #include "absl/strings/string_view.h"
 
 namespace firebase {
@@ -46,7 +46,7 @@ class Token {
 
   /** The actual raw token. */
   const std::string& token() const {
-    FIREBASE_ASSERT(user_.is_authenticated());
+    HARD_ASSERT(user_.is_authenticated());
     return token_;
   }
 
diff --git a/Firestore/core/src/firebase/firestore/auth/user.cc b/Firestore/core/src/firebase/firestore/auth/user.cc
index 4793fed..4fc10f6 100644
--- a/Firestore/core/src/firebase/firestore/auth/user.cc
+++ b/Firestore/core/src/firebase/firestore/auth/user.cc
@@ -16,7 +16,7 @@
 
 #include "Firestore/core/src/firebase/firestore/auth/user.h"
 
-#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
+#include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
 
 namespace firebase {
 namespace firestore {
@@ -26,7 +26,7 @@ User::User() : is_authenticated_(false) {
 }
 
 User::User(const absl::string_view uid) : uid_(uid), is_authenticated_(true) {
-  FIREBASE_ASSERT(!uid.empty());
+  HARD_ASSERT(!uid.empty());
 }
 
 const User& User::Unauthenticated() {