Internal change

PiperOrigin-RevId: 250313477
Change-Id: I9403bc746b347bde688aff24610b96c17ddd9bcc
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/StreamRecyclerViewAdapterTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/StreamRecyclerViewAdapterTest.java
index 0f93413..364cef3 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/StreamRecyclerViewAdapterTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/StreamRecyclerViewAdapterTest.java
@@ -62,6 +62,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -111,7 +112,7 @@
     frameContainer = new LinearLayout(context);
 
     when(pietManager.createPietFrameAdapter(
-            Mockito.<Supplier<ViewGroup>>any(),
+            ArgumentMatchers.<Supplier<ViewGroup>>any(),
             any(ActionHandler.class),
             any(EventLogger.class),
             eq(context)))
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java
index 1277879..f58798e 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java
@@ -78,6 +78,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Captor;
 import org.mockito.InOrder;
 import org.mockito.Mock;
@@ -182,7 +183,7 @@
         .thenReturn(StreamFeature.newBuilder().setContent(CONTENT).build());
     when(modelProvider.getSharedState(CONTENT_ID_1)).thenReturn(STREAM_SHARED_STATE_1);
     when(modelProvider.getSharedState(CONTENT_ID_2)).thenReturn(STREAM_SHARED_STATE_2);
-    when(actionParserFactory.build(Mockito.<Supplier<ContentMetadata>>any()))
+    when(actionParserFactory.build(ArgumentMatchers.<Supplier<ContentMetadata>>any()))
         .thenReturn(actionParser);
     viewLoggingUpdater = new ViewLoggingUpdater();
     contentDriver =
@@ -261,7 +262,7 @@
     verify(pietViewHolder, never())
         .bind(
             any(Frame.class),
-            Mockito.<List<PietSharedState>>any(),
+            ArgumentMatchers.<List<PietSharedState>>any(),
             any(StreamActionApi.class),
             any(FeedActionPayload.class),
             any(LoggingListener.class),
@@ -645,7 +646,7 @@
         .thenReturn(StreamFeature.newBuilder().setContent(content).build());
 
     reset(actionParserFactory);
-    when(actionParserFactory.build(Mockito.<Supplier<ContentMetadata>>any()))
+    when(actionParserFactory.build(ArgumentMatchers.<Supplier<ContentMetadata>>any()))
         .thenReturn(actionParser);
 
     contentDriver =
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContinuationDriverTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContinuationDriverTest.java
index 4b52256..f3f72f4 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContinuationDriverTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContinuationDriverTest.java
@@ -59,8 +59,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
 import org.mockito.InOrder;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.robolectric.Robolectric;
@@ -341,7 +341,9 @@
     // synthetic token.
     verify(cursorChangedListener)
         .onNewChildren(
-            any(ModelChild.class), Mockito.<List<ModelChild>>any(), /* wasSynthetic= */ eq(true));
+            any(ModelChild.class),
+            ArgumentMatchers.<List<ModelChild>>any(),
+            /* wasSynthetic= */ eq(true));
   }
 
   @Test
@@ -546,7 +548,9 @@
 
     verify(cursorChangedListener, never())
         .onNewChildren(
-            any(ModelChild.class), Matchers.<List<ModelChild>>any(), /* wasSynthetic= */ eq(false));
+            any(ModelChild.class),
+            ArgumentMatchers.<List<ModelChild>>any(),
+            /* wasSynthetic= */ eq(false));
   }
 
   @Test
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java
index 0f417a4..181f538 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java
@@ -64,8 +64,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
@@ -112,7 +112,7 @@
 
     // TODO: Use FakePietManager once it is implemented.
     when(pietManager.createPietFrameAdapter(
-            Mockito.<Supplier<ViewGroup>>any(),
+            ArgumentMatchers.<Supplier<ViewGroup>>any(),
             any(ActionHandler.class),
             any(EventLogger.class),
             eq(context)))
@@ -147,7 +147,7 @@
     ArgumentCaptor<ActionHandler> captor = ArgumentCaptor.forClass(ActionHandler.class);
     verify(pietManager)
         .createPietFrameAdapter(
-            Mockito.<Supplier<ViewGroup>>any(),
+            ArgumentMatchers.<Supplier<ViewGroup>>any(),
             captor.capture(),
             any(EventLogger.class),
             any(Context.class));
@@ -443,7 +443,7 @@
 
     verify(pietManager)
         .createPietFrameAdapter(
-            Mockito.<Supplier<ViewGroup>>any(),
+            ArgumentMatchers.<Supplier<ViewGroup>>any(),
             eq(actionHandler),
             pietEventLoggerCaptor.capture(),
             eq(context));
diff --git a/src/test/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserTest.java b/src/test/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserTest.java
index fcf6297..2a5ca88 100644
--- a/src/test/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserTest.java
@@ -66,8 +66,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
@@ -667,7 +667,7 @@
     verify(streamActionApi, never())
         .dismiss(
             anyString(),
-            Mockito.anyListOf(StreamDataOperation.class),
+            ArgumentMatchers.anyList(),
             any(UndoAction.class),
             any(ActionPayload.class));
   }
@@ -686,10 +686,7 @@
         DISMISS_LOCAL_FEED_ACTION, streamActionApi, /* view= */ null, ActionSource.CLICK);
     verify(streamActionApi, never())
         .handleNotInterestedIn(
-            Mockito.anyListOf(StreamDataOperation.class),
-            any(UndoAction.class),
-            any(ActionPayload.class),
-            anyInt());
+            ArgumentMatchers.anyList(), any(UndoAction.class), any(ActionPayload.class), anyInt());
   }
 
   @Test
@@ -710,7 +707,7 @@
     verify(streamActionApi, never())
         .dismiss(
             anyString(),
-            Mockito.anyListOf(StreamDataOperation.class),
+            ArgumentMatchers.anyList(),
             any(UndoAction.class),
             any(ActionPayload.class));
   }
@@ -733,7 +730,7 @@
     verify(streamActionApi, never())
         .dismiss(
             anyString(),
-            Mockito.anyListOf(StreamDataOperation.class),
+            ArgumentMatchers.anyList(),
             any(UndoAction.class),
             any(ActionPayload.class));
   }
diff --git a/src/test/java/com/google/android/libraries/feed/feedknowncontent/FeedKnownContentImplTest.java b/src/test/java/com/google/android/libraries/feed/feedknowncontent/FeedKnownContentImplTest.java
index 7988f57..1829471 100644
--- a/src/test/java/com/google/android/libraries/feed/feedknowncontent/FeedKnownContentImplTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedknowncontent/FeedKnownContentImplTest.java
@@ -42,9 +42,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link FeedKnownContentImpl}. */
@@ -171,7 +171,7 @@
 
     contentMetadataResultCaptor.getValue().accept(Result.failure());
 
-    verify(knownContentConsumer, never()).accept(Mockito.<List<ContentMetadata>>any());
+    verify(knownContentConsumer, never()).accept(ArgumentMatchers.<List<ContentMetadata>>any());
   }
 
   @Test
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java
index 7df3914..947b960 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java
@@ -38,8 +38,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
@@ -72,7 +72,7 @@
     adapterItems = createAdapterItems();
     when(menuMeasurer.measureAdapterContent(
             any(ViewGroup.class),
-            Mockito.<ArrayAdapter<? extends Object>>any(),
+            ArgumentMatchers.<ArrayAdapter<? extends Object>>any(),
             anyInt(),
             anyInt(),
             anyInt()))
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/StreamOfflineMonitorTest.java b/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/StreamOfflineMonitorTest.java
index 92cc2ef..ddfeed8 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/StreamOfflineMonitorTest.java
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/StreamOfflineMonitorTest.java
@@ -33,9 +33,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link StreamOfflineMonitor}. */
@@ -126,7 +126,8 @@
 
     streamOfflineMonitor.requestOfflineStatusForNewContent();
     verify(offlineIndicatorApi)
-        .getOfflineStatus(listArgumentCaptor.capture(), Mockito.<Consumer<List<String>>>any());
+        .getOfflineStatus(
+            listArgumentCaptor.capture(), ArgumentMatchers.<Consumer<List<String>>>any());
 
     assertThat(listArgumentCaptor.getValue())
         .containsExactlyElementsIn(Arrays.asList(URL, url1, url2));
@@ -144,7 +145,8 @@
     streamOfflineMonitor.requestOfflineStatusForNewContent();
 
     verify(offlineIndicatorApi, never())
-        .getOfflineStatus(eq(Collections.emptyList()), Mockito.<Consumer<List<String>>>any());
+        .getOfflineStatus(
+            eq(Collections.emptyList()), ArgumentMatchers.<Consumer<List<String>>>any());
   }
 
   @Test
@@ -152,7 +154,8 @@
     streamOfflineMonitor.requestOfflineStatusForNewContent();
 
     verify(offlineIndicatorApi, never())
-        .getOfflineStatus(eq(Collections.emptyList()), Mockito.<Consumer<List<String>>>any());
+        .getOfflineStatus(
+            eq(Collections.emptyList()), ArgumentMatchers.<Consumer<List<String>>>any());
   }
 
   @Test