third_party/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 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/src/google/protobuf/io/zero_copy_stream_impl_lite.cc ('k') | third_party/protobuf/src/google/protobuf/lite_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc

diff --git a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc b/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc

index 8c7358c1911a516ea2358ee0e53c1ee10535792d..a9db8872d41e499e5a80cc2503948e3f69b356ba 100644

--- a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc

+++ b/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc

@@ -63,8 +63,9 @@

#endif

#include <sstream>

-#include <google/protobuf/io/zero_copy_stream_impl.h>

+#include <google/protobuf/testing/file.h>

#include <google/protobuf/io/coded_stream.h>

+#include <google/protobuf/io/zero_copy_stream_impl.h>

#if HAVE_ZLIB

#include <google/protobuf/io/gzip_stream.h>

@@ -72,7 +73,6 @@

#include <google/protobuf/stubs/common.h>

#include <google/protobuf/stubs/logging.h>

-#include <google/protobuf/stubs/scoped_ptr.h>

#include <google/protobuf/testing/googletest.h>

#include <google/protobuf/testing/file.h>

#include <gtest/gtest.h>