Changes to update Junit and Mockito.

chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java

Index: chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java
index c113a2d1670b80356e4e70a90defd8f96779fdb4..ac43c5484a42e0df217e9368d8da515c463cce7f 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java
@@ -7,13 +7,13 @@ package org.chromium.chrome.browser.media.router.cast;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
@@ -587,7 +587,7 @@ public class CastMessageHandlerTest {
         mMessageHandler.onMessageReceived(NAMESPACE1, message.toString());
         assertEquals(mMessageHandler.getRequestsForTest().size(), 1);
         verify(mMessageHandler).onAppMessage(
-                eq(message.toString()), eq(NAMESPACE1), isNull(RequestRecord.class));
+                eq(message.toString()), eq(NAMESPACE1), (RequestRecord) isNull());
     }
 
     @Test
@@ -604,7 +604,7 @@ public class CastMessageHandlerTest {
         mMessageHandler.onMessageReceived(NAMESPACE1, message.toString());
         assertEquals(mMessageHandler.getRequestsForTest().size(), 1);
         verify(mMessageHandler).onAppMessage(
-                eq(message.toString()), eq(NAMESPACE1), isNull(RequestRecord.class));
+                eq(message.toString()), eq(NAMESPACE1), (RequestRecord) isNull());
     }
 
     @Test
@@ -612,7 +612,7 @@ public class CastMessageHandlerTest {
     public void testOnMessageReceivedOfMediaNamespace() throws JSONException {
         doNothing().when(mMessageHandler).onMediaMessage(anyString(), any(RequestRecord.class));
         mMessageHandler.onMessageReceived(MEDIA_NAMESPACE, "anymessage");
-        verify(mMessageHandler).onMediaMessage(eq("anymessage"), isNull(RequestRecord.class));
+        verify(mMessageHandler).onMediaMessage(eq("anymessage"), (RequestRecord) isNull());
     }
 
     @Test
@@ -752,7 +752,7 @@ public class CastMessageHandlerTest {
                 anyString(), anyString(), anyString(), anyInt());
         mMessageHandler.onVolumeChanged(CLIENT_ID1, SEQUENCE_NUMBER1);
         verify(mMessageHandler).sendClientMessageTo(
-                eq(CLIENT_ID1), eq("v2_message"), isNull(String.class), eq(SEQUENCE_NUMBER1));
+                eq(CLIENT_ID1), eq("v2_message"), (String) isNull(), eq(SEQUENCE_NUMBER1));
     }
 
     @Test
@@ -762,7 +762,7 @@ public class CastMessageHandlerTest {
                 anyString(), anyString(), anyString(), anyInt());
         mMessageHandler.onAppMessageSent(CLIENT_ID1, SEQUENCE_NUMBER1);
         verify(mMessageHandler).sendClientMessageTo(
-                eq(CLIENT_ID1), eq("app_message"), isNull(String.class), eq(SEQUENCE_NUMBER1));
+                eq(CLIENT_ID1), eq("app_message"), (String) isNull(), eq(SEQUENCE_NUMBER1));
     }
 
     @Test