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

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

Index: third_party/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
diff --git a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
similarity index 90%
rename from third_party/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java
rename to third_party/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
index e3a8d4f408718e393de96f91aea44d436bbd974d..58b80007f94f95debc501e44557192859a0e9baf 100644
--- a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java
+++ b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
@@ -36,19 +36,19 @@ import protobuf_unittest.UnittestProto.TestAllTypesOrBuilder;
 import junit.framework.TestCase;
 
 /**
- * Tests for {@link SingleFieldBuilderV3}. This tests basic functionality.
+ * Tests for {@link SingleFieldBuilder}. This tests basic functionality.
  * More extensive testing is provided via other tests that exercise the
  * builder.
  *
  * @author jonp@google.com (Jon Perlow)
  */
-public class SingleFieldBuilderV3Test extends TestCase {
+public class SingleFieldBuilderTest extends TestCase {
 
   public void testBasicUseAndInvalidations() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
+    SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
         TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
+        new SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
             TestAllTypesOrBuilder>(
             TestAllTypes.getDefaultInstance(),
             mockParent,
@@ -76,9 +76,9 @@ public class SingleFieldBuilderV3Test extends TestCase {
 
   public void testSetMessage() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
+    SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
         TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
+        new SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
             TestAllTypesOrBuilder>(
             TestAllTypes.getDefaultInstance(),
             mockParent,
@@ -102,9 +102,9 @@ public class SingleFieldBuilderV3Test extends TestCase {
 
   public void testClear() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
+    SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
         TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
+        new SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
             TestAllTypesOrBuilder>(
             TestAllTypes.getDefaultInstance(),
             mockParent,
@@ -122,9 +122,9 @@ public class SingleFieldBuilderV3Test extends TestCase {
 
   public void testMerge() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
+    SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
         TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
+        new SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
             TestAllTypesOrBuilder>(
             TestAllTypes.getDefaultInstance(),
             mockParent,