Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/src/google/protobuf/util/internal/testdata/maps.proto

Index: third_party/protobuf/src/google/protobuf/util/internal/testdata/maps.proto
diff --git a/third_party/protobuf/src/google/protobuf/util/internal/testdata/maps.proto b/third_party/protobuf/src/google/protobuf/util/internal/testdata/maps.proto
index 0f381b320bedbaacc169f2fd23ad89474ba561eb..6475ecddc2561f14c9a51588182594c8413900e5 100644
--- a/third_party/protobuf/src/google/protobuf/util/internal/testdata/maps.proto
+++ b/third_party/protobuf/src/google/protobuf/util/internal/testdata/maps.proto
@@ -28,76 +28,11 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// Proto to test proto3 maps.
 syntax = "proto3";
 
-package google.protobuf.testing;
-
-// Top-level test cases proto used by MarshallingTest. See description
-// at the top of the class MarshallingTest for details on how to write
-// test cases.
-message MapsTestCases {
-  EmptyMap empty_map = 1;
-  StringtoInt string_to_int = 2;
-  IntToString int_to_string = 3;
-  Mixed1 mixed1 = 4;
-  Mixed2 mixed2 = 5;
-  MapOfObjects map_of_objects = 6;
-
-  // Empty key tests
-  StringtoInt empty_key_string_to_int1 = 7;
-  StringtoInt empty_key_string_to_int2 = 8;
-  StringtoInt empty_key_string_to_int3 = 9;
-  BoolToString empty_key_bool_to_string = 10;
-  IntToString empty_key_int_to_string = 11;
-  Mixed1 empty_key_mixed = 12;
-  MapOfObjects empty_key_map_objects = 13;
-}
-
-message EmptyMap {
-  map<int32, int32> map = 1;
-}
-
-message StringtoInt {
-  map<string, int32> map = 1;
-}
-
-message IntToString {
-  map<int32, string> map = 1;
-}
-
-message BoolToString {
-  map<bool, string> map = 1;
-}
-
-message Mixed1 {
-  string msg = 1;
-  map<string, float> map = 2;
-}
-
-message Mixed2 {
-  enum E {
-    E0 = 0;
-    E1 = 1;
-    E2 = 2;
-    E3 = 3;
-  }
-  map<int32, bool> map = 1;
-  E ee = 2;
-}
-
-message MapOfObjects {
-  message M {
-    string inner_text = 1;
-  }
-  map<string, M> map = 1;
-}
-
-message DummyRequest {
-}
-
-service MapsTestService {
-  rpc Call(DummyRequest) returns (MapsTestCases);
-}
+package google.protobuf.testing.maps;
+option java_package = "com.google.protobuf.testing.maps";
 
 message MapIn {
   string other = 1;
@@ -144,3 +79,8 @@ message MapOutWireFormat {
 message MapM {
   string foo = 1;
 }
+
+service TestService {
+  rpc Call1(MapIn) returns (MapOut);
+  rpc Call2(MapIn) returns (MapOut);
+}