Revert https://codereview.chromium.org/1291903002 (protobuf roll).

third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc

Index: third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
diff --git a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc b/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
index f77c768fc990ccc4a83ba6d6f917864f0e2a996c..dad6ff14468d031f16baafb2f1ca567961251c43 100644
--- a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
+++ b/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
@@ -1,6 +1,6 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
+// http://code.google.com/p/protobuf/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -34,7 +34,6 @@
 
 #include <google/protobuf/io/zero_copy_stream.h>
 
-#include <google/protobuf/stubs/common.h>
 
 namespace google {
 namespace protobuf {
@@ -44,14 +43,6 @@ ZeroCopyInputStream::~ZeroCopyInputStream() {}
 ZeroCopyOutputStream::~ZeroCopyOutputStream() {}
 
 
-bool ZeroCopyOutputStream::WriteAliasedRaw(const void* /* data */,
-                                           int /* size */) {
-  GOOGLE_LOG(FATAL) << "This ZeroCopyOutputStream doesn't support aliasing. "
-                "Reaching here usually means a ZeroCopyOutputStream "
-                "implementation bug.";
-  return false;
-}
-
 }  // namespace io
 }  // namespace protobuf
 }  // namespace google