Merge 874e973 into eb3380e

Author: dconeybe

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/AggregationTest.java

@@ -37,7 +37,6 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
 import com.google.common.truth.Truth;
-import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import java.util.Collections;
 import java.util.Map;
@@ -904,15 +903,7 @@ public void testAggregateErrorMessageShouldContainConsoleLinkIfMissingIndex() {
 
     Throwable cause = throwable.getCause();
     Truth.assertThat(cause).hasMessageThat().ignoringCase().contains("index");
-    // TODO(b/316359394) Remove this check for the default databases once cl/582465034 is rolled
-    // out to production.
-    if (collection
-        .firestore
-        .getDatabaseId()
-        .getDatabaseId()
-        .equals(DatabaseId.DEFAULT_DATABASE_ID)) {
-      Truth.assertThat(cause).hasMessageThat().contains("https://console.firebase.google.com");
-    }
+    Truth.assertThat(cause).hasMessageThat().contains("https://console.firebase.google.com");
   }
 
   @Test

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CountTest.java

@@ -33,7 +33,6 @@
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
-import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import java.util.Collections;
 import org.junit.After;
@@ -277,14 +276,6 @@ public void testCountErrorMessageShouldContainConsoleLinkIfMissingIndex() {
 
     Throwable cause = throwable.getCause();
     assertThat(cause).hasMessageThat().ignoringCase().contains("index");
-    // TODO(b/316359394) Remove this check for the default databases once cl/582465034 is rolled
-    // out to production.
-    if (collection
-        .firestore
-        .getDatabaseId()
-        .getDatabaseId()
-        .equals(DatabaseId.DEFAULT_DATABASE_ID)) {
-      assertThat(cause).hasMessageThat().contains("https://console.firebase.google.com");
-    }
+    assertThat(cause).hasMessageThat().contains("https://console.firebase.google.com");
   }
 }