Remove use of private copy of Guava within espresso

These methods are removed in androidx.

Bug: 896775
Change-Id: I553a80f90d0b16946935cad7d1dbb590e79626a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2235741Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776506}

chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataIntegrationTest.java

@@ -39,7 +39,6 @@ import static org.chromium.chrome.browser.autofill_assistant.AutofillAssistantUi
 import static org.chromium.chrome.browser.autofill_assistant.AutofillAssistantUiTestUtil.waitUntilViewMatchesCondition;
 
 import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.core.deps.guava.collect.Iterables;
 import android.support.test.espresso.matcher.ViewMatchers;
 import android.support.test.filters.MediumTest;
 import android.widget.DatePicker;
@@ -760,11 +759,12 @@ public class AutofillAssistantCollectUserDataIntegrationTest {
         testService.waitUntilGetNextActions(numNextActionsCalled + 1);
 
         List<ProcessedActionProto> processedActions = testService.getProcessedActions();
-        ViewMatchers.assertThat(Iterables.getOnlyElement(processedActions).getStatus(),
+        assertThat(processedActions.size(), equalTo(1));
+        ViewMatchers.assertThat(processedActions.get(0).getStatus(),
                 CoreMatchers.is(ProcessedActionStatusProto.ACTION_APPLIED));
-        CollectUserDataResultProto result =
-                Iterables.getOnlyElement(processedActions).getCollectUserDataResult();
-        assertThat(Iterables.getOnlyElement(result.getAdditionalSectionsValuesList()),
+        CollectUserDataResultProto result = processedActions.get(0).getCollectUserDataResult();
+        assertThat(result.getAdditionalSectionsValuesList().size(), equalTo(1));
+        assertThat(result.getAdditionalSectionsValuesList().get(0),
                 equalTo(ModelValue.newBuilder()
                                 .setIdentifier("field_1")
                                 .setValue(ValueProto.newBuilder().setStrings(

chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTestUtil.java

@@ -22,7 +22,6 @@ import android.support.test.espresso.NoMatchingViewException;
 import android.support.test.espresso.UiController;
 import android.support.test.espresso.ViewAction;
 import android.support.test.espresso.ViewAssertion;
-import android.support.test.espresso.core.deps.guava.base.Preconditions;
 import android.support.test.espresso.matcher.BoundedMatcher;
 import android.text.Spanned;
 import android.text.SpannedString;
@@ -238,7 +237,7 @@ class AutofillAssistantUiTestUtil {
     }
 
     static Matcher<View> isNextAfterSibling(final Matcher<View> siblingMatcher) {
-        Preconditions.checkNotNull(siblingMatcher);
+        assert siblingMatcher != null;
         return new TypeSafeMatcher<View>() {
             @Override
             public void describeTo(Description description) {