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

Unified Diff: third_party/protobuf/src/google/protobuf/unknown_enum_test.proto

Issue 1291903002: Pull new version of protobuf sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fix attempts Created 5 years, 4 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/src/google/protobuf/unknown_enum_test.proto
diff --git a/third_party/protobuf/python/google/protobuf/internal/factory_test1.proto b/third_party/protobuf/src/google/protobuf/unknown_enum_test.proto
similarity index 67%
copy from third_party/protobuf/python/google/protobuf/internal/factory_test1.proto
copy to third_party/protobuf/src/google/protobuf/unknown_enum_test.proto
index 9f55e037f6e69ff8e76a3f260eff006af1bcce65..0ea1ede3fff6d646884b865d44790596d6a0038b 100644
--- a/third_party/protobuf/python/google/protobuf/internal/factory_test1.proto
+++ b/third_party/protobuf/src/google/protobuf/unknown_enum_test.proto
@@ -1,6 +1,6 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
-// http://code.google.com/p/protobuf/
+// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
@@ -28,28 +28,33 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Author: matthewtoia@google.com (Matt Toia)
+// Definitions of protos for testing cross-version compatibility. The
+// UpRevision message acts as if it were a newer version of the DownRevision
+// message. That is, UpRevision shares all the same fields as DownRevision,
+// but UpRevision can add fields and add enum values.
+syntax = "proto2";
+package google.protobuf.util;
-package google.protobuf.python.internal;
-
+message DownRevision {
+ enum Enum {
+ DEFAULT_VALUE = 2;
+ NONDEFAULT_VALUE = 3;
+ }
-enum Factory1Enum {
- FACTORY_1_VALUE_0 = 0;
- FACTORY_1_VALUE_1 = 1;
+ optional Enum value = 1 [default = DEFAULT_VALUE];
+ repeated Enum values = 2;
}
-message Factory1Message {
- optional Factory1Enum factory_1_enum = 1;
- enum NestedFactory1Enum {
- NESTED_FACTORY_1_VALUE_0 = 0;
- NESTED_FACTORY_1_VALUE_1 = 1;
+message UpRevision {
+ enum Enum {
+ DEFAULT_VALUE = 2;
+ NONDEFAULT_VALUE = 3;
+ NEW_VALUE = 4;
+ NEW_VALUE_2 = 5;
+ NEW_VALUE_3 = 6;
}
- optional NestedFactory1Enum nested_factory_1_enum = 2;
- message NestedFactory1Message {
- optional string value = 1;
- }
- optional NestedFactory1Message nested_factory_1_message = 3;
- optional int32 scalar_value = 4;
- repeated string list_value = 5;
+
+ optional Enum value = 1 [default = DEFAULT_VALUE];
+ repeated Enum values = 2;
}

Powered by Google App Engine
This is Rietveld 408576698