Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto

Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4) (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto
diff --git a/third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto b/third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto
index a75338ef167ffc1c0d5540ee841ff5f2c03f4423..686edc422183d34d3a67130d112fa76d9bf6588e 100644
--- a/third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto
+++ b/third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto
@@ -124,7 +124,6 @@ message TestOneof {
oneof oneof_field {
int32 oneof_int32 = 1;
TestAllTypes.NestedMessage oneof_nested_message = 2;
- google.protobuf.NullValue oneof_null_value = 3;
}
}
@@ -195,14 +194,8 @@ message TestStruct {
message TestAny {
google.protobuf.Any any_value = 1;
- map<string, google.protobuf.Any> any_map = 2;
}
message TestCustomJsonName {
int32 value = 1 [json_name = "@value"];
}
-
-message TestRecursive {
- int32 value = 1;
- TestRecursive nested = 2;
-}

Powered by Google App Engine
This is Rietveld 408576698