third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/java/compatibility_tests/v2.5.0/more_protos/src/proto/google/protobuf/unittest_lite.proto

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
+// http://code.google.com/p/protobuf/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 // copyright notice, this list of conditions and the following disclaimer
 // in the documentation and/or other materials provided with the
@@ skipping 11 matching lines @@
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (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)
 //
 // This is like unittest.proto but with optimize_for = LITE_RUNTIME.
 
-syntax = "proto2";
 package protobuf_unittest;
 
 import "google/protobuf/unittest_import_lite.proto";
 
 option optimize_for = LITE_RUNTIME;
 
 option java_package = "com.google.protobuf";
 
 // Same as TestAllTypes but with the lite runtime.
 message TestAllTypesLite {
-
   message NestedMessage {
     optional int32 bb = 1;
-    optional int64 cc = 2;
   }
 
   enum NestedEnum {
     FOO = 1;
     BAR = 2;
     BAZ = 3;
   }
 
   // Singular
   optional    int32 optional_int32    =  1;
@@ skipping 87 matching lines @@
   optional    bytes default_bytes    = 75 [default = "world"];
 
   optional NestedEnum default_nested_enum = 81 [default = BAR];
   optional ForeignEnumLite default_foreign_enum = 82
       [default = FOREIGN_LITE_BAR];
   optional protobuf_unittest_import.ImportEnumLite
       default_import_enum = 83 [default = IMPORT_LITE_BAR];
 
   optional string default_string_piece = 84 [ctype=STRING_PIECE,default="abc"];
   optional string default_cord = 85 [ctype=CORD,default="123"];
-
-  // For oneof test
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-    NestedMessage oneof_lazy_nested_message = 115 [lazy = true];
-  }
 }
 
 message ForeignMessageLite {
   optional int32 c = 1;
 }
 
 enum ForeignEnumLite {
   FOREIGN_LITE_FOO = 4;
   FOREIGN_LITE_BAR = 5;
   FOREIGN_LITE_BAZ = 6;
@@ skipping 122 matching lines @@
   optional TestAllTypesLite.NestedEnum
     default_nested_enum_extension_lite = 81 [default = BAR];
   optional ForeignEnumLite
     default_foreign_enum_extension_lite = 82 [default = FOREIGN_LITE_BAR];
   optional protobuf_unittest_import.ImportEnumLite
     default_import_enum_extension_lite = 83 [default = IMPORT_LITE_BAR];
 
   optional string default_string_piece_extension_lite = 84 [ctype=STRING_PIECE,
                                                             default="abc"];
   optional string default_cord_extension_lite = 85 [ctype=CORD, default="123"];
-
-  // For oneof test
-  optional uint32 oneof_uint32_extension_lite = 111;
-  optional TestAllTypesLite.NestedMessage oneof_nested_message_extension_lite = 112;
-  optional string oneof_string_extension_lite = 113;
-  optional bytes oneof_bytes_extension_lite = 114;
 }
 
 message TestPackedExtensionsLite {
   extensions 1 to max;
 }
 
 extend TestPackedExtensionsLite {
   repeated    int32 packed_int32_extension_lite    =  90 [packed = true];
   repeated    int64 packed_int64_extension_lite    =  91 [packed = true];
   repeated   uint32 packed_uint32_extension_lite   =  92 [packed = true];
@@ skipping 45 matching lines @@
   }
   repeated group RepeatedGroup = 20 {
     optional TestAllTypesLite repeated_group_all_types = 21;
   }
   extensions 1000 to max;
   extend TestParsingMergeLite {
     optional TestAllTypesLite optional_ext = 1000;
     repeated TestAllTypesLite repeated_ext = 1001;
   }
 }
-
-// TestEmptyMessageLite is used to test unknown fields support in lite mode.
-message TestEmptyMessageLite{
-}
-
-// Like above, but declare all field numbers as potential extensions.  No
-// actual extensions should ever be defined for this type.
-message TestEmptyMessageWithExtensionsLite {
-  extensions 1 to max;
-}
-
-enum V1EnumLite {
-    V1_FIRST = 1;
-}
-
-enum V2EnumLite {
-    V2_FIRST = 1;
-    V2_SECOND = 2;
-}
-
-message V1MessageLite {
-    required int32 int_field = 1;
-    optional V1EnumLite enum_field = 2 [ default = V1_FIRST ];
-}
-
-message V2MessageLite {
-    required int32 int_field = 1;
-    optional V2EnumLite enum_field = 2 [ default = V2_FIRST ];
-}