Roll back accidental inclusion of non-public Mockito helper methods

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=154232020

javatests/google/registry/dns/writer/clouddns/BUILD

@@ -11,7 +11,6 @@ java_library(
     name = "clouddns",
     srcs = glob(["*Test.java"]),
     deps = [
-        "//java/com/google/testing/mockito",
         "//java/google/registry/dns/writer/clouddns",
         "//java/google/registry/model",
         "//java/google/registry/util",

javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java

@@ -38,7 +38,6 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.google.common.net.InetAddresses;
 import com.google.common.util.concurrent.RateLimiter;
-import com.google.testing.mockito.Mocks;
 import com.googlecode.objectify.Key;
 import google.registry.dns.writer.clouddns.CloudDnsWriter.ZoneStateException;
 import google.registry.model.domain.DomainResource;
@@ -61,21 +60,18 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 
 /** Test case for {@link CloudDnsWriter}. */
-@RunWith(JUnit4.class)
+@RunWith(MockitoJUnitRunner.class)
 public class CloudDnsWriterTest {
 
-  @Rule
-  public final Mocks mocks = new Mocks(this);
-
   private static final Inet4Address IPv4 = (Inet4Address) InetAddresses.forString("127.0.0.1");
   private static final Inet6Address IPv6 = (Inet6Address) InetAddresses.forString("::1");
   private static final DelegationSignerData DS_DATA =

javatests/google/registry/dns/writer/dnsupdate/BUILD

@@ -11,7 +11,6 @@ java_library(
     name = "dnsupdate",
     srcs = glob(["*.java"]),
     deps = [
-        "//java/com/google/testing/mockito",
         "//java/google/registry/dns/writer/dnsupdate",
         "//java/google/registry/model",
         "//javatests/google/registry/testing",

javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java

@@ -34,7 +34,6 @@ import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.InetAddresses;
-import com.google.testing.mockito.Mocks;
 import com.googlecode.objectify.Key;
 import google.registry.model.domain.DomainResource;
 import google.registry.model.domain.secdns.DelegationSignerData;
@@ -53,10 +52,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.xbill.DNS.Flags;
 import org.xbill.DNS.Message;
 import org.xbill.DNS.Opcode;
@@ -68,7 +67,7 @@ import org.xbill.DNS.Type;
 import org.xbill.DNS.Update;
 
 /** Unit tests for {@link DnsUpdateWriter}. */
-@RunWith(JUnit4.class)
+@RunWith(MockitoJUnitRunner.class)
 public class DnsUpdateWriterTest {
 
   @Rule
@@ -81,9 +80,6 @@ public class DnsUpdateWriterTest {
   @Rule
   public final InjectRule inject = new InjectRule();
 
-  @Rule
-  public final Mocks mocks = new Mocks(this);
-
   @Mock
   private DnsMessageTransport mockResolver;
 

javatests/google/registry/export/sheet/BUILD

@@ -9,7 +9,6 @@ java_library(
     name = "sheet",
     srcs = glob(["*.java"]),
     deps = [
-        "//java/com/google/testing/mockito",
         "//java/google/registry/config",
         "//java/google/registry/export/sheet",
         "//java/google/registry/model",

javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java

@@ -32,7 +32,6 @@ import static org.mockito.Mockito.verify;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.testing.mockito.Mocks;
 import google.registry.model.common.Cursor;
 import google.registry.model.ofy.Ofy;
 import google.registry.model.registrar.Registrar;
@@ -46,13 +45,13 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link SyncRegistrarsSheet}. */
-@RunWith(JUnit4.class)
+@RunWith(MockitoJUnitRunner.class)
 public class SyncRegistrarsSheetTest {
 
   @Rule
@@ -63,9 +62,6 @@ public class SyncRegistrarsSheetTest {
   @Rule
   public final InjectRule inject = new InjectRule();
 
-  @Rule
-  public final Mocks mocks = new Mocks(this);
-
   @Captor
   private ArgumentCaptor<ImmutableList<ImmutableMap<String, String>>> rowsCaptor;