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

Unified Diff: third_party/protobuf/js/test_bootstrap.js

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
« no previous file with comments | « third_party/protobuf/js/test5.proto ('k') | third_party/protobuf/js/testbinary.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/js/test_bootstrap.js
diff --git a/third_party/protobuf/src/google/protobuf/unittest_import_public.proto b/third_party/protobuf/js/test_bootstrap.js
similarity index 85%
copy from third_party/protobuf/src/google/protobuf/unittest_import_public.proto
copy to third_party/protobuf/js/test_bootstrap.js
index ea5d1b13fea77a432cecc0980664c020159d108a..9d00a1c430b9e07b372caa783ba8e4899b72b63d 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_import_public.proto
+++ b/third_party/protobuf/js/test_bootstrap.js
@@ -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,13 +28,14 @@
// (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)
+/**
+ * @fileoverview Sets flags for uncompiled JSUnit tests.
+ */
-
-package protobuf_unittest_import;
-
-option java_package = "com.google.protobuf.test";
-
-message PublicImportMessage {
- optional int32 e = 1;
-}
+/**
+ * Set uncompiled flags.
+ */
+var CLOSURE_DEFINES = {
+ // Enable the fromObject method on the message class.
+ 'jspb.Message.GENERATE_FROM_OBJECT': true
+};
« no previous file with comments | « third_party/protobuf/js/test5.proto ('k') | third_party/protobuf/js/testbinary.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698