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

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_generator_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/csharp/csharp_generator_unittest.cc
diff --git a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc b/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc
similarity index 75%
copy from third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
copy to third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc
index dad6ff14468d031f16baafb2f1ca567961251c43..7ef7df42b6b209b9d50a9f3475b610929710f8f7 100644
--- a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
+++ b/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_generator_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/
+// Copyright 2014 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
@@ -28,21 +28,27 @@
// (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: kenton@google.com (Kenton Varda)
-// Based on original Protocol Buffers design by
-// Sanjay Ghemawat, Jeff Dean, and others.
+#include <memory>
+#include <google/protobuf/compiler/ruby/ruby_generator.h>
+#include <google/protobuf/compiler/command_line_interface.h>
#include <google/protobuf/io/zero_copy_stream.h>
+#include <google/protobuf/io/printer.h>
+#include <google/protobuf/testing/googletest.h>
+#include <gtest/gtest.h>
+#include <google/protobuf/testing/file.h>
namespace google {
namespace protobuf {
-namespace io {
+namespace compiler {
+namespace csharp {
+namespace {
-ZeroCopyInputStream::~ZeroCopyInputStream() {}
-ZeroCopyOutputStream::~ZeroCopyOutputStream() {}
+// TODO(jtattermusch): add some tests.
-
-} // namespace io
+} // namespace
+} // namespace csharp
+} // namespace compiler
} // namespace protobuf
} // namespace google

Powered by Google App Engine
This is Rietveld 408576698