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

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/java/java_doc_comment_unittest.cc

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/compiler/java/java_doc_comment_unittest.cc
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_doc_comment_unittest.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_doc_comment_unittest.cc
index 28b6d8b49e4996cf7d9df2569a5240a27b07996b..ae582ea6490401f2c4d8a20d0c142464a0164241 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_doc_comment_unittest.cc
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_doc_comment_unittest.cc
@@ -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
@@ -46,6 +46,7 @@ TEST(JavaDocCommentTest, Escaping) {
EXPECT_EQ("{@foo}", EscapeJavadoc("{@foo}"));
EXPECT_EQ("&lt;i&gt;&amp;&lt;/i&gt;", EscapeJavadoc("<i>&</i>"));
EXPECT_EQ("foo&#92;u1234bar", EscapeJavadoc("foo\\u1234bar"));
+ EXPECT_EQ("&#64;deprecated", EscapeJavadoc("@deprecated"));
}
// TODO(kenton): It's hard to write a robust test of the doc comments -- we

Powered by Google App Engine
This is Rietveld 408576698