Update third_party/protobuf to protobuf-v3.0.0-beta-3

third_party/protobuf/java/core/src/test/java/com/google/protobuf/ServiceTest.java

Index: third_party/protobuf/java/core/src/test/java/com/google/protobuf/ServiceTest.java
diff --git a/third_party/protobuf/java/src/test/java/com/google/protobuf/ServiceTest.java b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/ServiceTest.java
similarity index 97%
rename from third_party/protobuf/java/src/test/java/com/google/protobuf/ServiceTest.java
rename to third_party/protobuf/java/core/src/test/java/com/google/protobuf/ServiceTest.java
index ff980d66d1b3d064f1d063d971e89f0ad031fb39..b902737ded9e90a565153b64f9aaffb22f010ecd 100644
--- a/third_party/protobuf/java/src/test/java/com/google/protobuf/ServiceTest.java
+++ b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/ServiceTest.java
@@ -35,22 +35,22 @@ import com.google.protobuf.Descriptors.MethodDescriptor;
 import google.protobuf.no_generic_services_test.UnittestNoGenericServices;
 import protobuf_unittest.MessageWithNoOuter;
 import protobuf_unittest.ServiceWithNoOuter;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestService;
-import protobuf_unittest.UnittestProto.FooRequest;
-import protobuf_unittest.UnittestProto.FooResponse;
 import protobuf_unittest.UnittestProto.BarRequest;
 import protobuf_unittest.UnittestProto.BarResponse;
+import protobuf_unittest.UnittestProto.FooRequest;
+import protobuf_unittest.UnittestProto.FooResponse;
+import protobuf_unittest.UnittestProto.TestAllTypes;
+import protobuf_unittest.UnittestProto.TestService;
+
+import junit.framework.TestCase;
 
 import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
 import org.easymock.IArgumentMatcher;
+import org.easymock.classextension.IMocksControl;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 /**
  * Tests services and stubs.
  *
@@ -175,12 +175,14 @@ public class ServiceTest extends TestCase {
     MethodDescriptor fooMethod =
         ServiceWithNoOuter.getDescriptor().findMethodByName("Foo");
     MessageWithNoOuter request = MessageWithNoOuter.getDefaultInstance();
-    RpcCallback<Message> callback = new RpcCallback<Message>() {
-      public void run(Message parameter) {
-        // No reason this should be run.
-        fail();
-      }
-    };
+    RpcCallback<Message> callback =
+        new RpcCallback<Message>() {
+          @Override
+          public void run(Message parameter) {
+            // No reason this should be run.
+            fail();
+          }
+        };
     RpcCallback<TestAllTypes> specializedCallback =
         RpcUtil.specializeCallback(callback);
 
@@ -290,7 +292,9 @@ public class ServiceTest extends TestCase {
     public boolean isCalled() { return called; }
 
     public void reset() { called = false; }
-    public void run(Type message) { called = true; }
+    @Override
+    public void run(Type message) {
+      called = true; }
   }
 
   /** Implementation of the wrapsCallback() argument matcher. */
@@ -301,6 +305,7 @@ public class ServiceTest extends TestCase {
       this.callback = callback;
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public boolean matches(Object actual) {
       if (!(actual instanceof RpcCallback)) {
@@ -313,6 +318,7 @@ public class ServiceTest extends TestCase {
       return callback.isCalled();
     }
 
+    @Override
     public void appendTo(StringBuffer buffer) {
       buffer.append("wrapsCallback(mockCallback)");
     }