From 51e3279ad3ced2194dd6677799bb50aea42e8abf Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <mrschmidt@google.com>
Date: Mon, 7 Feb 2022 15:46:59 -0700
Subject: [PATCH] Remove AccessHelper.clearPersistence()

Not needed anymore since it was added to the public API
---
 .../java/com/google/firebase/firestore/AccessHelper.java     | 5 -----
 .../java/com/google/firebase/firestore/FirestoreTest.java    | 4 ++--
 .../firebase/firestore/testutil/IntegrationTestUtil.java     | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/AccessHelper.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/AccessHelper.java
index 765f359abbe..b9d0bce0c55 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/AccessHelper.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/AccessHelper.java
@@ -15,7 +15,6 @@
 package com.google.firebase.firestore;
 
 import android.content.Context;
-import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.firestore.auth.CredentialsProvider;
 import com.google.firebase.firestore.auth.User;
@@ -50,8 +49,4 @@ public static FirebaseFirestore newFirebaseFirestore(
   public static AsyncQueue getAsyncQueue(FirebaseFirestore firestore) {
     return firestore.getAsyncQueue();
   }
-
-  public static Task<Void> clearPersistence(FirebaseFirestore firestore) {
-    return firestore.clearPersistence();
-  }
 }
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
index 7a8038e42dc..365ed0261a7 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
@@ -1071,7 +1071,7 @@ public void testCanClearPersistenceAfterRestarting() throws Exception {
     waitFor(docRef.set(map("foo", "bar")));
     waitFor(firestore.terminate());
     IntegrationTestUtil.removeFirestore(firestore);
-    waitFor(AccessHelper.clearPersistence(firestore));
+    waitFor(firestore.clearPersistence());
 
     // We restart the app with the same name and options to check that the previous instance's
     // persistent storage is actually cleared after the restart. Calling testFirestore() without the
@@ -1088,7 +1088,7 @@ public void testClearPersistenceWhileRunningFails() {
     FirebaseFirestore firestore = testFirestore();
     waitFor(firestore.enableNetwork());
 
-    Task<Void> transactionTask = AccessHelper.clearPersistence(firestore);
+    Task<Void> transactionTask = firestore.clearPersistence();
     waitForException(transactionTask);
     assertFalse(transactionTask.isSuccessful());
     Exception e = transactionTask.getException();
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java
index f19b224448c..819c691051c 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java
@@ -271,7 +271,7 @@ public static FirebaseFirestore testFirestore(
             asyncQueue,
             /*firebaseApp=*/ null,
             /*instanceRegistry=*/ (dbId) -> {});
-    waitFor(AccessHelper.clearPersistence(firestore));
+    waitFor(firestore.clearPersistence());
     firestore.setFirestoreSettings(settings);
     firestoreStatus.put(firestore, true);