rebase

Author: cherylEnkidu

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

@@ -89,7 +89,7 @@ public ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
             return super.getDocumentsMatchingQuery(query, offset);
           }
         };
-    queryEngine.initialize(localDocuments, indexManager, false);
+    queryEngine.initialize(localDocuments, indexManager);
   }
 
   /** Adds the provided documents to the remote document cache. */
@@ -232,7 +232,7 @@ public void testCombinesIndexedWithNonIndexedResults() throws Exception {
               TimeUnit.MILLISECONDS.convert(
                   (beforeAutoEnd - beforeAutoStart), TimeUnit.NANOSECONDS);
           totalBeforeIndex += (beforeAutoEnd - beforeAutoStart);
-          totalDocumentCount += counterWithoutIndex.fullScanCount;
+          totalDocumentCount += counterWithoutIndex.getDocumentCount();
           assertEquals(portion * totalSetCount, results.size());
 
           QueryContext counterWithIndex = new QueryContext();
@@ -254,7 +254,7 @@ public void testCombinesIndexedWithNonIndexedResults() throws Exception {
                     + numOfFields
                     + " fields.\n"
                     + "Weight result for without auto indexing is "
-                    + without * counterWithoutIndex.fullScanCount
+                    + without * counterWithoutIndex.getDocumentCount()
                     + ". And weight result for auto indexing is "
                     + with * results.size());
           }