Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

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

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 24 matching lines @@
 import google.protobuf.no_generic_services_test.UnittestNoGenericServices;
 import protobuf_unittest.MessageWithNoOuter;
 import protobuf_unittest.ServiceWithNoOuter;
 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 java.util.HashSet;
-import java.util.Set;
 import junit.framework.TestCase;
+
 import org.easymock.classextension.EasyMock;
 import org.easymock.IArgumentMatcher;
 import org.easymock.classextension.IMocksControl;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Tests services and stubs.
  *
  * @author kenton@google.com Kenton Varda
  */
 public class ServiceTest extends TestCase {
   private IMocksControl control;
   private RpcController mockController;
 
   private final Descriptors.MethodDescriptor fooDescriptor =
@@ skipping 200 matching lines @@
 
     // But descriptors are there.
     FileDescriptor file = UnittestNoGenericServices.getDescriptor();
     assertEquals(1, file.getServices().size());
     assertEquals("TestService", file.getServices().get(0).getName());
     assertEquals(1, file.getServices().get(0).getMethods().size());
     assertEquals("Foo",
         file.getServices().get(0).getMethods().get(0).getName());
   }
 
-
-
   // =================================================================
 
   /**
    * wrapsCallback() is an EasyMock argument predicate.  wrapsCallback(c)
    * matches a callback if calling that callback causes c to be called.
    * In other words, c wraps the given callback.
    */
   private <Type extends Message> RpcCallback<Type> wrapsCallback(
       MockCallback<?> callback) {
     EasyMock.reportMatcher(new WrapsCallback(callback));
@@ skipping 33 matching lines @@
       actualCallback.run(null);
       return callback.isCalled();
     }
 
     @Override
     public void appendTo(StringBuffer buffer) {
       buffer.append("wrapsCallback(mockCallback)");
     }
   }
 }