Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/conformance/conformance_cpp.cc

Index: third_party/protobuf/conformance/conformance_cpp.cc
diff --git a/third_party/protobuf/conformance/conformance_cpp.cc b/third_party/protobuf/conformance/conformance_cpp.cc
index b865cd93ed6b1806818c2fb3cbe1f847d153f23e..1a2654932587d25fe7d6006c1736ee3e3d14de3a 100644
--- a/third_party/protobuf/conformance/conformance_cpp.cc
+++ b/third_party/protobuf/conformance/conformance_cpp.cc
@@ -33,12 +33,12 @@
 #include <unistd.h>
 
 #include "conformance.pb.h"
-#include <google/protobuf/test_messages_proto3.pb.h>
 #include <google/protobuf/util/json_util.h>
 #include <google/protobuf/util/type_resolver_util.h>
 
 using conformance::ConformanceRequest;
 using conformance::ConformanceResponse;
+using conformance::TestAllTypes;
 using google::protobuf::Descriptor;
 using google::protobuf::DescriptorPool;
 using google::protobuf::internal::scoped_ptr;
@@ -47,7 +47,6 @@ using google::protobuf::util::JsonToBinaryString;
 using google::protobuf::util::NewTypeResolverForDescriptorPool;
 using google::protobuf::util::Status;
 using google::protobuf::util::TypeResolver;
-using protobuf_test_messages::proto3::TestAllTypes;
 using std::string;
 
 static const char kTypeUrlPrefix[] = "type.googleapis.com";