Revert "third_party/protobuf: Update to HEAD (5f65ee6ac7)"

third_party/protobuf/src/google/protobuf/descriptor_database_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 30 matching lines @@
 #endif
 
 #include <google/protobuf/descriptor_database.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/text_format.h>
 #include <google/protobuf/stubs/strutil.h>
 
 #include <google/protobuf/stubs/logging.h>
 #include <google/protobuf/stubs/common.h>
+#include <google/protobuf/stubs/scoped_ptr.h>
 #include <google/protobuf/testing/googletest.h>
 #include <gtest/gtest.h>
 
 namespace google {
 namespace protobuf {
 namespace {
 
 static void AddToDatabase(SimpleDescriptorDatabase* database,
                           const char* file_text) {
   FileDescriptorProto file_proto;
@@ skipping 342 matching lines @@
     "dependency: \"foo.proto\" "
     "message_type { "
     "  name: \"Bar\" "
     "  extension_range { start: 1 end: 1000 } "
     "} "
     "extension { name:\"grault\" extendee: \".Foo\"       number:32 } "
     "extension { name:\"garply\" extendee: \".corge.Bar\" number:70 } "
     "extension { name:\"waldo\"  extendee: \"Bar\"        number:56 } ");
 
   {
-    std::vector<int> numbers;
+    vector<int> numbers;
     EXPECT_TRUE(database_->FindAllExtensionNumbers("Foo", &numbers));
     ASSERT_EQ(2, numbers.size());
     std::sort(numbers.begin(), numbers.end());
     EXPECT_EQ(5, numbers[0]);
     EXPECT_EQ(32, numbers[1]);
   }
 
   {
-    std::vector<int> numbers;
+    vector<int> numbers;
     EXPECT_TRUE(database_->FindAllExtensionNumbers("corge.Bar", &numbers));
     // Note: won't find extension 56 due to the name not being fully qualified.
     ASSERT_EQ(1, numbers.size());
     EXPECT_EQ(70, numbers[0]);
   }
 
   {
     // Can't find extensions for non-existent types.
-    std::vector<int> numbers;
+    vector<int> numbers;
     EXPECT_FALSE(database_->FindAllExtensionNumbers("NoSuchType", &numbers));
   }
 
   {
     // Can't find extensions for unqualified types.
-    std::vector<int> numbers;
+    vector<int> numbers;
     EXPECT_FALSE(database_->FindAllExtensionNumbers("Bar", &numbers));
   }
 }
 
 TEST_P(DescriptorDatabaseTest, ConflictingFileError) {
   AddToDatabase(
     "name: \"foo.proto\" "
     "message_type { "
     "  name: \"Foo\" "
     "}");
@@ skipping 253 matching lines @@
     // Can't find non-existent extension.
     FileDescriptorProto file;
     EXPECT_FALSE(
       forward_merged_.FindFileContainingExtension("Foo", 6, &file));
   }
 }
 
 TEST_F(MergedDescriptorDatabaseTest, FindAllExtensionNumbers) {
   {
     // Message only has extension in database1_
-    std::vector<int> numbers;
+    vector<int> numbers;
     EXPECT_TRUE(forward_merged_.FindAllExtensionNumbers("Foo", &numbers));
     ASSERT_EQ(1, numbers.size());
     EXPECT_EQ(3, numbers[0]);
   }
 
   {
     // Message only has extension in database2_
-    std::vector<int> numbers;
+    vector<int> numbers;
     EXPECT_TRUE(forward_merged_.FindAllExtensionNumbers("Bar", &numbers));
     ASSERT_EQ(1, numbers.size());
     EXPECT_EQ(5, numbers[0]);
   }
 
   {
     // Merge results from the two databases.
-    std::vector<int> numbers;
+    vector<int> numbers;
     EXPECT_TRUE(forward_merged_.FindAllExtensionNumbers("Baz", &numbers));
     ASSERT_EQ(2, numbers.size());
     std::sort(numbers.begin(), numbers.end());
     EXPECT_EQ(12, numbers[0]);
     EXPECT_EQ(13, numbers[1]);
   }
 
   {
-    std::vector<int> numbers;
+    vector<int> numbers;
     EXPECT_TRUE(reverse_merged_.FindAllExtensionNumbers("Baz", &numbers));
     ASSERT_EQ(2, numbers.size());
     std::sort(numbers.begin(), numbers.end());
     EXPECT_EQ(12, numbers[0]);
     EXPECT_EQ(13, numbers[1]);
   }
 
   {
     // Can't find extensions for a non-existent message.
-    std::vector<int> numbers;
+    vector<int> numbers;
     EXPECT_FALSE(reverse_merged_.FindAllExtensionNumbers("Blah", &numbers));
   }
 }
 
 }  // anonymous namespace
 }  // namespace protobuf
 }  // namespace google