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

third_party/protobuf/java/core/src/test/proto/com/google/protobuf/map_test.proto

Index: third_party/protobuf/java/core/src/test/proto/com/google/protobuf/map_test.proto
diff --git a/third_party/protobuf/java/core/src/test/proto/com/google/protobuf/map_test.proto b/third_party/protobuf/java/core/src/test/proto/com/google/protobuf/map_test.proto
index bc2105e50ff6c1a67e04731469cddfb5beab89a7..2280ac03b7322c59ceba481d341f818c4def8910 100644
--- a/third_party/protobuf/java/core/src/test/proto/com/google/protobuf/map_test.proto
+++ b/third_party/protobuf/java/core/src/test/proto/com/google/protobuf/map_test.proto
@@ -34,6 +34,7 @@ package map_test;
 
 option java_package = "map_test";
 option java_outer_classname = "MapTestProto";
+option java_generate_equals_and_hash = true;
 
 message TestMap {
   message MessageValue {
@@ -52,59 +53,11 @@ message TestMap {
   map<int32, EnumValue>    int32_to_enum_field = 4;
   map<int32, MessageValue> int32_to_message_field = 5;
   map<string, int32>       string_to_int32_field = 6;
-  map<uint32, int32>       uint32_to_int32_field = 7;
-  map<int64, int32>        int64_to_int32_field = 8;
 }
 
-// Used to test that a nested builder containing map fields will properly
+// Used to test that a nested bulider containing map fields will properly
 // propagate the onChange event and mark its parent dirty when a change
 // is made to a map field.
 message TestOnChangeEventPropagation {
   TestMap optional_message = 1;
 }
-
-// a decoy of TestMap for testing parsing errors
-message BizarroTestMap {
-  map<int32, bytes> int32_to_int32_field = 1; // same key type, different value
-  map<string, int32> int32_to_string_field = 2; // different key and value types
-  map<string, int32> int32_to_bytes_field = 3; // different key types, same value
-  map<string, bytes> int32_to_enum_field = 4; // different key and value types
-  map<string, bytes> int32_to_message_field = 5; // different key and value types
-  map<string, bytes> string_to_int32_field = 6;  // same key type, different value
-}
-
-// Used to test that java reserved words can be used as protobuf field names
-// Not all reserved words are tested (to avoid bloat) but instead an arbitrary
-// subset of them chosen to cover various keyword categories like
-// type, modifier, declaration, etc.
-message ReservedAsMapField {
-  map<string, uint32> if = 1;
-  map<string, uint32> const = 2;
-  map<string, uint32> private = 3;
-  map<string, uint32> class = 4;
-  map<string, uint32> int = 5;
-  map<string, uint32> void = 6;
-  map<string, uint32> string = 7; // These are also proto keywords
-  map<string, uint32> package = 8;
-  map<string, uint32> enum = 9; // Most recent Java reserved word
-  map<string, uint32> null = 10;
-  // null is not a 'reserved word' per se but as a literal needs similar care
-}
-
-message ReservedAsMapFieldWithEnumValue {
-  enum SampleEnum {
-    A = 0;
-    B = 1;
-  }
-  map<string, SampleEnum> if = 1;
-  map<string, SampleEnum> const = 2;
-  map<string, SampleEnum> private = 3;
-  map<string, SampleEnum> class = 4;
-  map<string, SampleEnum> int = 5;
-  map<string, SampleEnum> void = 6;
-  map<string, SampleEnum> string = 7; // These are also proto keywords
-  map<string, SampleEnum> package = 8;
-  map<string, SampleEnum> enum = 9; // Most recent Java reserved word
-  map<string, SampleEnum> null = 10;
-  // null is not a 'reserved word' per se but as a literal needs similar care
-}