Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/src/google/protobuf/dynamic_message_unittest.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 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
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 27 matching lines @@
 // GenericMessageReflection needs to use.  So, we focus on that in this
 // test.  Other tests, such as generic_message_reflection_unittest and
 // reflection_ops_unittest, cover the rest of the functionality used by
 // DynamicMessage.
 
 #include <memory>
 #ifndef _SHARED_PTR_H
 #include <google/protobuf/stubs/shared_ptr.h>
 #endif
 
+#include <google/protobuf/stubs/scoped_ptr.h>
+#include <google/protobuf/stubs/common.h>
 #include <google/protobuf/dynamic_message.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/test_util.h>
 #include <google/protobuf/unittest.pb.h>
 #include <google/protobuf/unittest_no_field_presence.pb.h>
 
 #include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
 #include <google/protobuf/testing/googletest.h>
 #include <gtest/gtest.h>
 
 namespace google {
 namespace protobuf {
 
 class DynamicMessageTest : public testing::Test {
  protected:
   DescriptorPool pool_;
   DynamicMessageFactory factory_;
@@ skipping 215 matching lines @@
 
   // Also ensure that the default instance handles field presence properly.
   EXPECT_EQ(false, refl->HasField(*proto3_prototype_, optional_msg));
 
   delete message;
 }
 
 
 }  // namespace protobuf
 }  // namespace google