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

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

Issue 21231003: Update third_party/protobuf to r428, part 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 5 months 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/src/test/java/com/google/protobuf/test_bad_identifiers.proto
===================================================================
--- third_party/protobuf/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto (revision 214611)
+++ third_party/protobuf/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto (working copy)
@@ -46,6 +46,23 @@
message TestMessage {
}
+message Descriptor {
+ option no_standard_descriptor_accessor = true;
+ optional string descriptor = 1;
+ message NestedDescriptor {
+ option no_standard_descriptor_accessor = true;
+ optional string descriptor = 1;
+ }
+ optional NestedDescriptor nested_descriptor = 2;
+}
+
+message Parser {
+ enum ParserEnum {
+ PARSER = 1;
+ }
+ optional ParserEnum parser = 1;
+}
+
message Deprecated {
enum TestEnum {
FOO = 1;
@@ -62,6 +79,7 @@
message Object {
optional int32 object = 1;
+ optional string string_object = 2;
}
message String {

Powered by Google App Engine
This is Rietveld 408576698