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

Side by Side Diff: third_party/protobuf/objectivec/Tests/unittest_extension_chain_d.proto

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Make chrome settings proto generated file a component 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 unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2016 Google Inc. All rights reserved.
3 // https://developers.google.com/protocol-buffers/
4 // 3 //
5 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
7 // met: 6 // met:
8 // 7 //
9 // * Redistributions of source code must retain the above copyright 8 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 9 // notice, this list of conditions and the following disclaimer.
11 // * Redistributions in binary form must reproduce the above 10 // * Redistributions in binary form must reproduce the above
12 // copyright notice, this list of conditions and the following disclaimer 11 // copyright notice, this list of conditions and the following disclaimer
13 // in the documentation and/or other materials provided with the 12 // in the documentation and/or other materials provided with the
14 // distribution. 13 // distribution.
15 // * Neither the name of Google Inc. nor the names of its 14 // * Neither the name of Google Inc. nor the names of its
16 // contributors may be used to endorse or promote products derived from 15 // contributors may be used to endorse or promote products derived from
17 // this software without specific prior written permission. 16 // this software without specific prior written permission.
18 // 17 //
19 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 29
31 // Proto to test Proto3 Any serialization. 30 syntax = "proto2";
32 syntax = "proto3";
33 31
34 package google.protobuf.testing.anys; 32 package protobuf_unittest;
35 option java_package = "com.google.protobuf.testing.anys";
36 33
37 import "google/protobuf/any.proto"; 34 import "google/protobuf/unittest.proto";
38 35
39 message AnyIn { 36 import "unittest_extension_chain_b.proto";
40 string something = 1; 37 import "unittest_extension_chain_c.proto";
38
39 // The root should end up needing to merge B (C will be merged into B, so it
40 // doesn't need to be directly merged).
41
42 message ChainDMessage {
43 optional ChainBMessage b = 1;
44 optional ChainCMessage c = 2;
41 } 45 }
42 46
43 message AnyOut { 47 extend TestAllExtensions {
44 google.protobuf.Any any = 1; 48 optional int32 chain_d_extension = 10004;
45 } 49 }
46
47 message AnyM {
48 string foo = 1;
49 }
50
51 service TestService {
52 rpc Call(AnyIn) returns (AnyOut);
53 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698