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

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

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 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/nested_extension_lite.proto
diff --git a/third_party/protobuf/src/google/protobuf/unittest_lite_imports_nonlite.proto b/third_party/protobuf/java/src/test/java/com/google/protobuf/nested_extension_lite.proto
similarity index 77%
copy from third_party/protobuf/src/google/protobuf/unittest_lite_imports_nonlite.proto
copy to third_party/protobuf/java/src/test/java/com/google/protobuf/nested_extension_lite.proto
index d52cb8cc36d8924a3454f9170f6b338f14a59c5c..a95c38b234f2fd65eb112c6231ae2cb682e56207 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_lite_imports_nonlite.proto
+++ b/third_party/protobuf/java/src/test/java/com/google/protobuf/nested_extension_lite.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,16 +28,22 @@
// (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: kenton@google.com (Kenton Varda)
+// Author: Darick Tong (darick@google.com)
//
-// Tests that a "lite" message can import a regular message.
+// A proto file with nested extensions for a MessageLite messages. Note that
+// this must be defined in a separate file to properly test the initialization
+// of the outer class.
-package protobuf_unittest;
+syntax = "proto2";
-import "google/protobuf/unittest.proto";
+package protobuf_unittest;
option optimize_for = LITE_RUNTIME;
-message TestLiteImportsNonlite {
- optional TestAllTypes message = 1;
+import "com/google/protobuf/non_nested_extension_lite.proto";
+
+message MyNestedExtensionLite {
+ extend MessageLiteToBeExtended {
+ optional MessageLiteToBeExtended recursiveExtensionLite = 3;
+ }
}

Powered by Google App Engine
This is Rietveld 408576698