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

Unified Diff: third_party/protobuf/src/google/protobuf/unittest_no_arena_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/src/google/protobuf/unittest_no_arena_lite.proto
diff --git a/third_party/protobuf/src/google/protobuf/unittest_import_public_lite.proto b/third_party/protobuf/src/google/protobuf/unittest_no_arena_lite.proto
similarity index 81%
copy from third_party/protobuf/src/google/protobuf/unittest_import_public_lite.proto
copy to third_party/protobuf/src/google/protobuf/unittest_no_arena_lite.proto
index d077563cbd84d7be6daddec3f553cb564f23da0a..34c7b7ce99a95043e629b5c729c70e943e7d7eb9 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_import_public_lite.proto
+++ b/third_party/protobuf/src/google/protobuf/unittest_no_arena_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,15 +28,15 @@
// (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: liujisi@google.com (Pherl Liu)
-
-
-package protobuf_unittest_import;
+syntax = "proto2";
option optimize_for = LITE_RUNTIME;
-option java_package = "com.google.protobuf";
+// 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 test_util.h we do "using namespace unittest = protobuf_unittest".
+package protobuf_unittest_no_arena;
-message PublicImportMessageLite {
- optional int32 e = 1;
+message ForeignMessageLite {
+ optional int32 c = 1;
}

Powered by Google App Engine
This is Rietveld 408576698