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

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

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/map_proto2_unittest.proto
diff --git a/third_party/protobuf/src/google/protobuf/map_proto2_unittest.proto b/third_party/protobuf/src/google/protobuf/map_proto2_unittest.proto
deleted file mode 100644
index 3d4af28efed0f54990a8301ada5c84c4602b1bad..0000000000000000000000000000000000000000
--- a/third_party/protobuf/src/google/protobuf/map_proto2_unittest.proto
+++ /dev/null
@@ -1,68 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc. All rights reserved.
-// 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
-// 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
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// 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.
-
-syntax = "proto2";
-
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In map_test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest;
-
-enum Proto2MapEnum {
- PROTO2_MAP_ENUM_FOO = 0;
- PROTO2_MAP_ENUM_BAR = 1;
- PROTO2_MAP_ENUM_BAZ = 2;
-}
-
-enum Proto2MapEnumPlusExtra {
- E_PROTO2_MAP_ENUM_FOO = 0;
- E_PROTO2_MAP_ENUM_BAR = 1;
- E_PROTO2_MAP_ENUM_BAZ = 2;
- E_PROTO2_MAP_ENUM_EXTRA = 3;
-}
-
-enum Proto2MapEnumStartWithNonZero {
- PROTO2_NON_ZERO_MAP_ENUM_FOO = 1;
-}
-
-message TestEnumMap {
- map<int32, Proto2MapEnum> known_map_field = 101;
- map<int32, Proto2MapEnum> unknown_map_field = 102;
-}
-
-message TestEnumMapPlusExtra {
- map<int32, Proto2MapEnumPlusExtra> known_map_field = 101;
- map<int32, Proto2MapEnumPlusExtra> unknown_map_field = 102;
-}
-
-message TestEnumStartWithNonZeroMap {
- map<int32, Proto2MapEnumStartWithNonZero> map_field = 101;
-}
« no previous file with comments | « third_party/protobuf/src/google/protobuf/map_lite_unittest.proto ('k') | third_party/protobuf/src/google/protobuf/map_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698