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

third_party/protobuf/src/google/protobuf/unknown_field_set_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 470 matching lines @@
 
     EXPECT_EQ(repeated_field->number(), unknown_fields.field(2).number());
     ASSERT_EQ(UnknownField::TYPE_VARINT, unknown_fields.field(2).type());
     EXPECT_EQ(6, unknown_fields.field(2).varint());
   }
 }
 
 TEST_F(UnknownFieldSetTest, SpaceUsedExcludingSelf) {
   UnknownFieldSet empty;
   empty.AddVarint(1, 0);
-  EXPECT_EQ(sizeof(std::vector<UnknownField>) + sizeof(UnknownField),
+  EXPECT_EQ(sizeof(vector<UnknownField>) + sizeof(UnknownField),
             empty.SpaceUsedExcludingSelf());
 }
 
 TEST_F(UnknownFieldSetTest, SpaceUsed) {
   unittest::TestEmptyMessage empty_message;
 
   // Make sure an unknown field set has zero space used until a field is
   // actually added.
   int base_size = empty_message.SpaceUsed();
   UnknownFieldSet* unknown_fields = empty_message.mutable_unknown_fields();
@@ skipping 50 matching lines @@
             EXPECT_EQ(i, unknown.field(i).fixed32());
           } else {
             EXPECT_EQ(i + num, unknown.field(i).fixed32());
           }
         }
       }
     }
   }
 }
 
-void CheckDeleteByNumber(const std::vector<int>& field_numbers,
-                         int deleted_number,
-                         const std::vector<int>& expected_field_nubmers) {
+void CheckDeleteByNumber(const vector<int>& field_numbers, int deleted_number,
+                        const vector<int>& expected_field_nubmers) {
   UnknownFieldSet unknown_fields;
   for (int i = 0; i < field_numbers.size(); ++i) {
     unknown_fields.AddFixed32(field_numbers[i], i);
   }
   unknown_fields.DeleteByNumber(deleted_number);
   ASSERT_EQ(expected_field_nubmers.size(), unknown_fields.field_count());
   for (int i = 0; i < expected_field_nubmers.size(); ++i) {
     EXPECT_EQ(expected_field_nubmers[i],
               unknown_fields.field(i).number());
   }
 }
 
-#define MAKE_VECTOR(x) std::vector<int>(x, x + GOOGLE_ARRAYSIZE(x))
+#define MAKE_VECTOR(x) vector<int>(x, x + GOOGLE_ARRAYSIZE(x))
 TEST_F(UnknownFieldSetTest, DeleteByNumber) {
-  CheckDeleteByNumber(std::vector<int>(), 1, std::vector<int>());
+  CheckDeleteByNumber(vector<int>(), 1, vector<int>());
   static const int kTestFieldNumbers1[] = {1, 2, 3};
   static const int kFieldNumberToDelete1 = 1;
   static const int kExpectedFieldNumbers1[] = {2, 3};
   CheckDeleteByNumber(MAKE_VECTOR(kTestFieldNumbers1), kFieldNumberToDelete1,
                       MAKE_VECTOR(kExpectedFieldNumbers1));
   static const int kTestFieldNumbers2[] = {1, 2, 3};
   static const int kFieldNumberToDelete2 = 2;
   static const int kExpectedFieldNumbers2[] = {1, 3};
   CheckDeleteByNumber(MAKE_VECTOR(kTestFieldNumbers2), kFieldNumberToDelete2,
                       MAKE_VECTOR(kExpectedFieldNumbers2));
@@ skipping 11 matching lines @@
   static const int kFieldNumberToDelete5 = 6;
   static const int kExpectedFieldNumbers5[] = {1, 2, 3, 4, 5};
   CheckDeleteByNumber(MAKE_VECTOR(kTestFieldNumbers5), kFieldNumberToDelete5,
                       MAKE_VECTOR(kExpectedFieldNumbers5));
 }
 #undef MAKE_VECTOR
 }  // namespace
 
 }  // namespace protobuf
 }  // namespace google