Avoid wrapping and rewrapping NSStrings when constructing DatabaseId (#833)

* Avoid wrapping and rewrapping NSStrings when constructing DatabaseId

* Shorten DatabaseId::kDefaultDatabaseId

2 files changed, 3 insertions, 3 deletions

diff --git a/Firestore/core/test/firebase/firestore/core/database_info_test.cc b/Firestore/core/test/firebase/firestore/core/database_info_test.cc
index d865105..4c9691c 100644
--- a/Firestore/core/test/firebase/firestore/core/database_info_test.cc
+++ b/Firestore/core/test/firebase/firestore/core/database_info_test.cc
@@ -34,8 +34,8 @@ TEST(DatabaseInfo, Getter) {
 }
 
 TEST(DatabaseInfo, DefaultDatabase) {
-  DatabaseInfo info(DatabaseId("project id", DatabaseId::kDefaultDatabaseId),
-                    "key", "http://host", false);
+  DatabaseInfo info(DatabaseId("project id", DatabaseId::kDefault), "key",
+                    "http://host", false);
   EXPECT_EQ("project id", info.database_id().project_id());
   EXPECT_EQ("(default)", info.database_id().database_id());
   EXPECT_EQ("key", info.persistence_key());
diff --git a/Firestore/core/test/firebase/firestore/model/database_id_test.cc b/Firestore/core/test/firebase/firestore/model/database_id_test.cc
index 16b0e6b..c00415a 100644
--- a/Firestore/core/test/firebase/firestore/model/database_id_test.cc
+++ b/Firestore/core/test/firebase/firestore/model/database_id_test.cc
@@ -30,7 +30,7 @@ TEST(DatabaseId, Constructor) {
 }
 
 TEST(DatabaseId, DefaultDb) {
-  DatabaseId id("p", DatabaseId::kDefaultDatabaseId);
+  DatabaseId id("p", DatabaseId::kDefault);
   EXPECT_EQ("p", id.project_id());
   EXPECT_EQ("(default)", id.database_id());
   EXPECT_TRUE(id.IsDefaultDatabase());