firebase
diff --git a/‎firestore/integration_test_internal/src/firestore_test.cc‎
Lines changed: 2 additions & 2 deletions b/‎firestore/integration_test_internal/src/firestore_test.cc‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎firestore/src/android/firestore_android.h‎
Lines changed: 1 addition & 3 deletions b/‎firestore/src/android/firestore_android.h‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎firestore/src/common/firestore.cc‎
Lines changed: 4 additions & 3 deletions b/‎firestore/src/common/firestore.cc‎
Lines changed: 4 additions & 3 deletions
@@ -67,8 +67,8 @@ using ::testing::HasSubstr;
 
 class FirestoreTest : public FirestoreIntegrationTest {
  protected:
-  const std::string GetFirestoreDatabaseId(Firestore* firestore) {
-    return GetInternal(firestore)->database_name();
+  const std::string& GetFirestoreDatabaseId(Firestore* firestore) {
+    return GetInternal(firestore)->database_id().database_id();
   }
 };
 
 
@@ -166,9 +166,7 @@ class FirestoreInternal {
     firestore_public_ = firestore_public;
   }
 
-  const model::DatabaseId& database_id() const {
-    return this->database_id();
-  }
+  const model::DatabaseId& database_id() const { return this->database_id(); }
 
   Firestore* firestore_public() { return firestore_public_; }
   const Firestore* firestore_public() const { return firestore_public_; }
 
@@ -199,8 +199,8 @@ Firestore* Firestore::AddFirestoreToCache(Firestore* firestore,
     return nullptr;
   }
 
-  FirestoreMap::key_type key =
-      MakeKey(firestore->app(), firestore->internal_->database_id().database_id());
+  FirestoreMap::key_type key = MakeKey(
+      firestore->app(), firestore->internal_->database_id().database_id());
   FirestoreCache()->emplace(key, firestore);
   return firestore;
 }
@@ -381,7 +381,8 @@ Future<void> Firestore::EnableNetwork() {
 
 Future<void> Firestore::Terminate() {
   if (!internal_) return FailedFuture<void>();
-  FirestoreMap::key_type key = MakeKey(app(), internal_->database_id().database_id());
+  FirestoreMap::key_type key =
+      MakeKey(app(), internal_->database_id().database_id());
 
   FirestoreCache()->erase(key);
   return internal_->Terminate();
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ using ::testing::HasSubstr;`
`67`	`67`
`68`	`68`	`class FirestoreTest : public FirestoreIntegrationTest {`
`69`	`69`	`protected:`
`70`		`- const std::string GetFirestoreDatabaseId(Firestore* firestore) {`
`71`		`- return GetInternal(firestore)->database_name();`
	`70`	`+ const std::string& GetFirestoreDatabaseId(Firestore* firestore) {`
	`71`	`+ return GetInternal(firestore)->database_id().database_id();`
`72`	`72`	`}`
`73`	`73`	`};`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,7 @@ class FirestoreInternal {`
`166`	`166`	`firestore_public_ = firestore_public;`
`167`	`167`	`}`
`168`	`168`
`169`		`- const model::DatabaseId& database_id() const {`
`170`		`- return this->database_id();`
`171`		`- }`
	`169`	`+ const model::DatabaseId& database_id() const { return this->database_id(); }`
`172`	`170`
`173`	`171`	`Firestore* firestore_public() { return firestore_public_; }`
`174`	`172`	`const Firestore* firestore_public() const { return firestore_public_; }`